@indigo-labs/indigo-sdk 0.3.28 → 0.4.1

package/tests/gov/gov.test.ts

@@ -76,7 +76,7 @@ import { benchmarkAndAwaitTx } from '../utils/benchmark-utils';
 import {
   findAllTreasuryUtxos,
   findAllTreasuryUtxosWithNonAdaAsset,
-} from '../treasury/treasury-queries';
+} from '../../src/contracts/treasury/queries';
 import {
   createIndyUtxoAtTreasury,
   createUtxoAtTreasury,
@@ -97,10 +97,10 @@ import {
 import {
   findAllCollateralAssetsOfIAsset,
   findAllIAssets,
-  findCollateralAssetNew,
   findIAsset,
 } from '../queries/iasset-queries';
 import { startPriceOracleTx } from '../../src/contracts/price-oracle/transactions';
+import { findCollateralAsset as findCollateralAssetNew } from '../../src/contracts/iasset/queries';
 import { rationalFromInt, rationalZero } from '../../src/types/rational';
 import { expectScriptFailure } from '../utils/asserts';
 import { MAX_COLLATERAL_ASSETS_COUNT_PER_IASSET } from '../../src/contracts/iasset/helpers';
@@ -2072,9 +2072,9 @@ describe('Gov', () => {
       );
 
       const res = await findCollateralAssetNew(
-        context,
+        context.lucid,
         sysParams,
-        iusdAssetInfo.iassetTokenNameAscii,
+        fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
         collateralAsset1,
       );
 
@@ -2256,9 +2256,9 @@ describe('Gov', () => {
       );
 
       const res = await findCollateralAssetNew(
-        context,
+        context.lucid,
         sysParams,
-        iusdAssetInfo.iassetTokenNameAscii,
+        fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
         collateralAsset2,
       );
 
@@ -2451,15 +2451,15 @@ describe('Gov', () => {
       );
 
       const newCollateralAsset = await findCollateralAssetNew(
-        context,
+        context.lucid,
         sysParams,
-        iusdAssetInfo.iassetTokenNameAscii,
+        fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
         collateralAsset2,
       );
       const collateralAssetFirst = await findCollateralAssetNew(
-        context,
+        context.lucid,
         sysParams,
-        iusdAssetInfo.iassetTokenNameAscii,
+        fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
         collateralAsset1,
       );
 
@@ -2659,15 +2659,15 @@ describe('Gov', () => {
       );
 
       const newCollateralAsset = await findCollateralAssetNew(
-        context,
+        context.lucid,
         sysParams,
-        iusdAssetInfo.iassetTokenNameAscii,
+        fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
         collateralAsset2,
       );
       const collateralAssetFirst = await findCollateralAssetNew(
-        context,
+        context.lucid,
         sysParams,
-        iusdAssetInfo.iassetTokenNameAscii,
+        fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
         collateralAsset1,
       );
 
@@ -4085,9 +4085,9 @@ describe('Gov', () => {
         null,
         (
           await findCollateralAssetNew(
-            context,
+            context.lucid,
             sysParams,
-            iusdAssetInfo.iassetTokenNameAscii,
+            fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
             iusdAssetInfo.collateralAssets[0].collateralAsset,
           )
         ).utxo,
@@ -4236,9 +4236,9 @@ describe('Gov', () => {
             null,
             (
               await findCollateralAssetNew(
-                context,
+                context.lucid,
                 sysParams,
-                iusdAssetInfo.iassetTokenNameAscii,
+                fromHex(fromText(iusdAssetInfo.iassetTokenNameAscii)),
                 iusdAssetInfo.collateralAssets[0].collateralAsset,
               )
             ).utxo,

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

@@ -12,7 +12,7 @@ import {
   findAdminInterestCollectors,
   findAllInterestCollectors,
   findRandomNonAdminInterestCollector,
-} from './interest-collector-queries';
+} from '../../src/contracts/interest-collection/queries';
 import { benchmarkAndAwaitTx } from '../utils/benchmark-utils';
 import {
   batchCollectInterest,
@@ -60,10 +60,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Collect Interest - Cannot collect without interacting with a CDP', async (context: IndigoTestContext) => {
     const interestCollectionUtxo = await findRandomNonAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     await expectScriptFailure(
@@ -82,10 +79,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Collect Interest - Cannot collect from interest admin', async (context: IndigoTestContext) => {
     const adminInterestCollectorUtxo = await findAdminInterestCollectors(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const [iAssetConfig] = context.assetConfigs;
@@ -160,7 +154,7 @@ describe('Interest Collection', () => {
 
     const interestCollectors = await findAllInterestCollectors(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
+      context.systemParams,
     );
 
     const interestCollectorsUtxos = interestCollectors.filter(
@@ -225,10 +219,7 @@ describe('Interest Collection', () => {
 
     const interestCollectionUtxo = await findRandomNonAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     context.lucid.selectWallet.fromSeed(context.users.user.seedPhrase);
@@ -447,20 +438,14 @@ describe('Interest Collection', () => {
 
     const interestDistributeUtxo = matchSingle(
       (
-        await findAllInterestCollectors(
-          context.lucid,
-          context.systemParams.validatorHashes.interestCollectionHash,
-        )
+        await findAllInterestCollectors(context.lucid, context.systemParams)
       ).filter((utxo) => assetClassValueOf(utxo.assets, EXAMPLE_TOKEN_1)),
       (_) => new Error('Expected a single interest distribute UTXO'),
     );
 
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     await benchmarkAndAwaitTx(
@@ -491,18 +476,12 @@ describe('Interest Collection', () => {
     context.lucid.selectWallet.fromSeed(context.users.admin.seedPhrase);
 
     const interestDistributeUtxos = (
-      await findAllInterestCollectors(
-        context.lucid,
-        context.systemParams.validatorHashes.interestCollectionHash,
-      )
+      await findAllInterestCollectors(context.lucid, context.systemParams)
     ).filter((utxo) => assetClassValueOf(utxo.assets, EXAMPLE_TOKEN_1));
 
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     await benchmarkAndAwaitTx(
@@ -532,20 +511,14 @@ describe('Interest Collection', () => {
 
     const interestDistributeUtxo = matchSingle(
       (
-        await findAllInterestCollectors(
-          context.lucid,
-          context.systemParams.validatorHashes.interestCollectionHash,
-        )
+        await findAllInterestCollectors(context.lucid, context.systemParams)
       ).filter((utxo) => assetClassValueOf(utxo.assets, EXAMPLE_TOKEN_1)),
       (_) => new Error('Expected a single interest distribute UTXO'),
     );
 
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     await expectScriptFailure(
@@ -565,10 +538,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Update Permissions', async (context: IndigoTestContext) => {
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const govUtxo = await findGov(
@@ -607,10 +577,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Update Permissions - all of multiple signers', async (context: IndigoTestContext) => {
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const govUtxo = await findGov(
@@ -665,10 +632,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Update Permissions - some of multiple signers', async (context: IndigoTestContext) => {
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const govUtxo = await findGov(
@@ -728,10 +692,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Update Permissions - nested multisig', async (context: IndigoTestContext) => {
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const govUtxo = await findGov(
@@ -798,10 +759,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Update Permissions - Fail when new admin is not signed', async (context: IndigoTestContext) => {
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const govUtxo = await findGov(
@@ -834,10 +792,7 @@ describe('Interest Collection', () => {
   test<IndigoTestContext>('Update Permissions - Fail when not enough signers of new admin', async (context: IndigoTestContext) => {
     const interestAdminUtxo = await findAdminInterestCollector(
       context.lucid,
-      context.systemParams.validatorHashes.interestCollectionHash,
-      fromSystemParamsAsset(
-        context.systemParams.interestCollectionParams.multisigUtxoNft,
-      ),
+      context.systemParams,
     );
 
     const govUtxo = await findGov(

package/tests/queries/iasset-queries.ts

@@ -6,7 +6,7 @@ import {
   toText,
 } from '@lucid-evolution/lucid';
 import { createScriptAddress } from '../../src/utils/lucid-utils';
-import { fromSystemParamsAsset, matchSingle, SystemParams } from '../../src';
+import { matchSingle, SystemParams } from '../../src';
 import { option as O, array as A, function as F } from 'fp-ts';
 import {
   AssetClass,
@@ -19,7 +19,6 @@ import {
   parseCollateralAssetDatum,
   parseIAssetDatum,
 } from '../../src/contracts/iasset/types';
-import { LucidContext } from '../test-helpers';
 
 // TODO: replace with the new variant defined below
 export async function findIAsset(
@@ -56,44 +55,6 @@ export async function findIAsset(
   );
 }
 
-export async function findIAssetNew(
-  context: LucidContext,
-  sysParams: SystemParams,
-  // Ascii encoded
-  iassetName: string,
-): Promise<IAssetOutput> {
-  const iassetUtxos = await context.lucid.utxosAtWithUnit(
-    createScriptAddress(
-      context.lucid.config().network!,
-      sysParams.validatorHashes.iassetHash,
-    ),
-    assetClassToUnit(
-      fromSystemParamsAsset(sysParams.cdpParams.iAssetAuthToken),
-    ),
-  );
-
-  return matchSingle(
-    F.pipe(
-      iassetUtxos.map((utxo) =>
-        F.pipe(
-          O.fromNullable(utxo.datum),
-          O.flatMap(parseIAssetDatum),
-          O.flatMap((datum) => {
-            if (toHex(datum.assetName) === fromText(iassetName)) {
-              return O.some({ utxo, datum: datum });
-            } else {
-              return O.none;
-            }
-          }),
-        ),
-      ),
-      A.compact,
-    ),
-    (res) =>
-      new Error('Expected a single IAsset UTXO.: ' + JSON.stringify(res)),
-  );
-}
-
 export async function findAllIAssets(
   lucid: LucidEvolution,
   iassetScriptHash: ScriptHash,
@@ -160,50 +121,6 @@ export async function findCollateralAsset(
   );
 }
 
-export async function findCollateralAssetNew(
-  context: LucidContext,
-  sysParams: SystemParams,
-  // Ascii encoded
-  iassetName: string,
-  collateralAsset: AssetClass,
-): Promise<CollateralAssetOutput> {
-  const collateralAssetUtxos = await context.lucid.utxosAtWithUnit(
-    createScriptAddress(
-      context.lucid.config().network!,
-      sysParams.validatorHashes.iassetHash,
-    ),
-    assetClassToUnit(
-      fromSystemParamsAsset(sysParams.cdpParams.collateralAssetAuthToken),
-    ),
-  );
-
-  return matchSingle(
-    F.pipe(
-      collateralAssetUtxos.map((utxo) =>
-        F.pipe(
-          O.fromNullable(utxo.datum),
-          O.flatMap(parseCollateralAssetDatum),
-          O.flatMap((datum) => {
-            if (
-              isSameAssetClass(datum.collateralAsset, collateralAsset) &&
-              fromText(iassetName) === toHex(datum.iasset)
-            ) {
-              return O.some({ utxo, datum: datum });
-            } else {
-              return O.none;
-            }
-          }),
-        ),
-      ),
-      A.compact,
-    ),
-    (res) =>
-      new Error(
-        'Expected a single Collateral Asset UTXO.: ' + JSON.stringify(res),
-      ),
-  );
-}
-
 export async function findAllCollateralAssetsOfIAsset(
   lucid: LucidEvolution,
   iassetScriptHash: ScriptHash,