@indigo-labs/indigo-sdk 0.4.4 → 0.5.0

package/tests/cdp/transactions-mutated.ts

@@ -5,7 +5,6 @@ import {
   LucidEvolution,
   Credential,
   OutRef,
-  slotToUnixTime,
   toHex,
   TxBuilder,
   UTxO,
@@ -109,11 +108,9 @@ export async function mutatedRedeemCdp(
   govOref: OutRef,
   sysParams: SystemParams,
   lucid: LucidEvolution,
-  currentSlot: number,
   pythMessage?: string,
 ): Promise<TxBuilder> {
-  const network = lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
 
   const cdpRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -325,10 +322,9 @@ export async function mutatedRedeemCdp(
       getInlineDatumOrThrow(priceOracleUtxo),
     );
     const txValidity = oracleExpirationAwareValidity(
-      currentSlot,
+      lucid,
       Number(sysParams.cdpCreatorParams.biasTime),
       Number(priceOracleDatum.expirationTime),
-      network,
     );
 
     referenceInputs.push(priceOracleUtxo);
@@ -337,7 +333,7 @@ export async function mutatedRedeemCdp(
       .validTo(txValidity.validTo)
       .readFrom([priceOracleUtxo]);
   } else {
-    const validateFrom = slotToUnixTime(network, currentSlot - 1);
+    const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
     const validateTo =
       validateFrom + Number(sysParams.cdpCreatorParams.biasTime);
 
@@ -419,7 +415,9 @@ export async function runOpenCdpDelisted(
   );
 
   const network = context.lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, context.emulator.slot));
+  const currentTime = BigInt(
+    context.lucid.slotToUnixTime(context.lucid.currentSlot()),
+  );
 
   const [pkh, skh] = await addrDetails(context.lucid);
 
@@ -568,7 +566,9 @@ export async function runOpenCdpDelisted(
         )
       : undefined;
 
-  const validFrom = slotToUnixTime(network, context.emulator.slot - 1);
+  const validFrom = context.lucid.slotToUnixTime(
+    context.lucid.currentSlot() - 1,
+  );
   const validTo = validFrom + Number(sysParams.cdpCreatorParams.biasTime);
 
   tx.validFrom(validFrom).validTo(validTo);
@@ -622,7 +622,9 @@ export async function runOpenCdpAndUpdateOracle(
   );
 
   const network = context.lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, context.emulator.slot));
+  const currentTime = BigInt(
+    context.lucid.slotToUnixTime(context.lucid.currentSlot()),
+  );
 
   const [pkh, skh] = await addrDetails(context.lucid);
 
@@ -842,8 +844,9 @@ export async function runTestAdjustCdpDelisted(
   collateralAdjustment: bigint,
   debtAdjustment: bigint,
 ): Promise<TxBuilder> {
-  const network = context.lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, context.emulator.slot));
+  const currentTime = BigInt(
+    context.lucid.slotToUnixTime(context.lucid.currentSlot()),
+  );
   const [pkh, skh] = await addrDetails(context.lucid);
 
   const cdp = await findCdp(
@@ -912,7 +915,9 @@ export async function runTestAdjustCdpDelisted(
     sysParams,
   );
 
-  const validateFrom = slotToUnixTime(network, context.emulator.slot - 1);
+  const validateFrom = context.lucid.slotToUnixTime(
+    context.lucid.currentSlot() - 1,
+  );
   const validateTo =
     validateFrom + Number(sysParams.cdpParams.biasTime) - 60_000;
 
@@ -1064,8 +1069,9 @@ export async function runTestDepositCdpWithInterestVar(
 
   amount: bigint = 1_000_000n,
 ): Promise<TxBuilder> {
-  const network = context.lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, context.emulator.slot));
+  const currentTime = BigInt(
+    context.lucid.slotToUnixTime(context.lucid.currentSlot()),
+  );
   const [pkh, skh] = await addrDetails(context.lucid);
 
   const cdp = await findCdp(
@@ -1125,7 +1131,9 @@ export async function runTestDepositCdpWithInterestVar(
     getInlineDatumOrThrow(interestOracleUtxo),
   );
 
-  const validateFrom = slotToUnixTime(network, context.emulator.slot - 1);
+  const validateFrom = context.lucid.slotToUnixTime(
+    context.lucid.currentSlot() - 1,
+  );
   const validateTo =
     validateFrom + Number(sysParams.cdpParams.biasTime) - 60_000;
 
@@ -1241,7 +1249,6 @@ export async function runTestDepositCdpWithInterestVar(
 
 export async function runCloseCdpWrongOracle(
   lucid: LucidEvolution,
-  currentSlot: number,
   sysParams: SystemParams,
   iasset: string,
   wrongAsset: string,
@@ -1268,8 +1275,7 @@ export async function runCloseCdpWrongOracle(
     orefs.collateralAsset,
   );
 
-  const network = lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
 
   const cdpRefScriptUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -1336,10 +1342,9 @@ export async function runCloseCdpWrongOracle(
   );
 
   const txValidity = oracleExpirationAwareValidity(
-    currentSlot,
+    lucid,
     Number(sysParams.cdpCreatorParams.biasTime),
     Number(priceOracleDatum.expirationTime),
-    network,
   );
 
   const tx = lucid
@@ -1485,8 +1490,9 @@ export async function runRedeemCdpWrongOracle(
     getInlineDatumOrThrow(wrongPriceOracleUtxo),
   );
 
-  const network = context.lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, context.emulator.slot));
+  const currentTime = BigInt(
+    context.lucid.slotToUnixTime(context.lucid.currentSlot()),
+  );
 
   const cdpRefScriptUtxo = matchSingle(
     await context.lucid.utxosByOutRef([
@@ -1577,10 +1583,9 @@ export async function runRedeemCdpWrongOracle(
   );
 
   const txValidity = oracleExpirationAwareValidity(
-    context.emulator.slot,
+    context.lucid,
     Number(sysParams.cdpCreatorParams.biasTime),
     Number(wrongPriceOracleDatum.expirationTime),
-    network,
   );
 
   const referenceInputs = [

package/tests/endpoints/initialize.ts

@@ -41,7 +41,6 @@ export { initPythConfig, mintOneTimeToken, DEFAULT_INIT_OPTIONS };
 export async function init(
   lucid: LucidEvolution,
   defaultInitialAssets: InitialAssetParam[],
-  currentSlot: number,
   mkPythBasedAssets: (
     pythStateNft: AssetClass,
   ) => InitialAssetParam[] = () => [],
@@ -70,7 +69,6 @@ export async function init(
   return initContract(
     lucid,
     defaultInitialAssets,
-    currentSlot,
     mkPythBasedAssets,
     protocolParams,
     initOptions,

package/tests/gov/actions.ts

@@ -3,7 +3,6 @@ import {
   fromText,
   OutRef,
   paymentCredentialOf,
-  unixTimeToSlot,
 } from '@lucid-evolution/lucid';
 import {
   addrDetails,
@@ -70,14 +69,7 @@ export async function runVote(
 
   await runAndAwaitTx(
     context.lucid,
-    vote(
-      option,
-      pollShard.utxo,
-      stakingPosOref.utxo,
-      sysParams,
-      context.lucid,
-      context.emulator.slot,
-    ),
+    vote(option, pollShard.utxo, stakingPosOref.utxo, sysParams, context.lucid),
   );
 }
 
@@ -106,13 +98,7 @@ export async function runCreateAllShards(
 
     await runAndAwaitTx(
       context.lucid,
-      createShardsChunks(
-        2n,
-        pollUtxo.utxo,
-        sysParams,
-        context.emulator.slot,
-        context.lucid,
-      ),
+      createShardsChunks(2n, pollUtxo.utxo, sysParams, context.lucid),
     );
   }
 }
@@ -154,7 +140,6 @@ export async function runMergeAllShards(
         A.takeLeft(2)(allPollShards).map((u) => u.utxo),
         sysParams,
         context.lucid,
-        context.emulator.slot,
       ),
     );
   }
@@ -180,13 +165,7 @@ export async function runEndProposal(
 
   await runAndAwaitTx(
     context.lucid,
-    endProposal(
-      pollUtxo.utxo,
-      govUtxo.utxo,
-      sysParams,
-      context.lucid,
-      context.emulator.slot,
-    ),
+    endProposal(pollUtxo.utxo, govUtxo.utxo, sysParams, context.lucid),
   );
 }
 
@@ -202,15 +181,14 @@ export async function waitForVotingEnd(
     pollId,
   );
 
-  const targetSlot = unixTimeToSlot(
-    context.lucid.config().network!,
+  const targetSlot = context.lucid.unixTimeToSlot(
     Number(pollUtxo.datum.votingEndTime),
   );
 
-  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 + 1);
+    context.emulator.awaitSlot(targetSlot - context.lucid.currentSlot() + 1);
   }
 }
 
@@ -251,7 +229,6 @@ export async function runExecuteProposal(
       stableswapPoolOrCdpCreatorOref,
       sysParams,
       context.lucid,
-      context.emulator.slot,
     ),
   );
 }
@@ -334,7 +311,6 @@ export async function whitelistCollateralAsset(
     'COLLATERAL_ORACLE',
     initialPrice,
     oracleParams,
-    context.emulator.slot,
   );
   await runAndAwaitTxBuilder(context.lucid, priceOracleTx);
 
@@ -355,7 +331,6 @@ export async function whitelistCollateralAsset(
     null,
     sysParams,
     context.lucid,
-    context.emulator.slot,
     (
       await findGov(
         context.lucid,