@indigo-labs/indigo-sdk 0.1.8 → 0.1.9

package/dist/index.mjs

@@ -5,6 +5,7 @@ import {
   credentialToAddress as credentialToAddress3,
   Data as Data10,
   fromText as fromText4,
+  slotToUnixTime as slotToUnixTime2,
   validatorToAddress as validatorToAddress3,
   validatorToScriptHash as validatorToScriptHash3
 } from "@lucid-evolution/lucid";
@@ -602,9 +603,30 @@ function calculateAccruedInterest(now, unitaryInterestSnapshot, mintedAmount, in
   }
 }
 
+// src/helpers/price-oracle-helpers.ts
+import {
+  slotToUnixTime,
+  unixTimeToSlot
+} from "@lucid-evolution/lucid";
+function oracleExpirationAwareValidity(currentSlot, biasTime, oracleExpiration, network) {
+  const validateFrom = slotToUnixTime(network, currentSlot - 1);
+  const defaultValidateTo = validateFrom + biasTime;
+  const cappedValidateTo = slotToUnixTime(
+    network,
+    unixTimeToSlot(network, oracleExpiration) - 1
+  );
+  const isOracleActuallyExpired = cappedValidateTo <= validateFrom;
+  return {
+    validFrom: validateFrom,
+    validTo: isOracleActuallyExpired ? defaultValidateTo : Math.min(defaultValidateTo, cappedValidateTo)
+  };
+}
+
 // src/contracts/cdp.ts
 var CDPContract = class _CDPContract {
-  static async openPosition(asset, collateralAmount, mintedAmount, params, lucid, assetRef, priceOracleRef, interestOracleRef, cdpCreatorRef, collectorRef, now = Date.now()) {
+  static async openPosition(asset, collateralAmount, mintedAmount, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, cdpCreatorRef, collectorRef) {
+    const network = lucid.config().network;
+    const currentTime = BigInt(slotToUnixTime2(network, currentSlot));
     const [pkh, skh] = await addrDetails(lucid);
     const assetOut = await (assetRef ? IAssetHelpers.findIAssetByRef(assetRef, lucid) : IAssetHelpers.findIAssetByName(asset, params, lucid));
     if (!assetOut || !assetOut.datum) throw new Error("Unable to find IAsset");
@@ -630,7 +652,7 @@ var CDPContract = class _CDPContract {
     );
     const cdpCreatorOut = getRandomElement(
       cdpCreatorRef ? await lucid.utxosByOutRef([cdpCreatorRef]) : await lucid.utxosAtWithUnit(
-        credentialToAddress3(lucid.config().network, {
+        credentialToAddress3(network, {
           type: "Script",
           hash: params.validatorHashes.cdpCreatorHash
         }),
@@ -642,7 +664,7 @@ var CDPContract = class _CDPContract {
         cdpOwner: pkh.hash,
         minted: mintedAmount,
         collateral: collateralAmount,
-        currentTime: BigInt(now)
+        currentTime
       }
     });
     const cdpCreatorScriptRefUtxo = await scriptRef(
@@ -656,7 +678,7 @@ var CDPContract = class _CDPContract {
     };
     cdpValue[cdpToken] = 1n;
     const newSnapshot = calculateUnitaryInterestSinceOracleLastUpdated(
-      BigInt(now),
+      currentTime,
       interestOracleDatum
     ) + interestOracleDatum.unitaryInterest;
     const cdpDatum = {
@@ -665,7 +687,7 @@ var CDPContract = class _CDPContract {
       mintedAmt: mintedAmount,
       cdpFees: {
         ActiveCDPInterestTracking: {
-          lastSettled: BigInt(now),
+          lastSettled: currentTime,
           unitaryInterestSnapshot: newSnapshot
         }
       }
@@ -687,10 +709,12 @@ var CDPContract = class _CDPContract {
       BigInt(assetOut.datum.debtMintingFeePercentage.getOnChainInt),
       mintedAmount * oracleDatum.price.getOnChainInt / 1000000n
     );
-    const cappedValidateTo = oracleDatum.expiration - 20001n;
-    const timeValidFrom = now - 1e3;
-    const timeValidTo_ = now + Number(params.cdpCreatorParams.biasTime) - 1e3;
-    const timeValidTo = cappedValidateTo <= timeValidFrom ? timeValidTo_ : Math.min(timeValidTo_, Number(cappedValidateTo));
+    const txValidity = oracleExpirationAwareValidity(
+      currentSlot,
+      Number(params.cdpCreatorParams.biasTime),
+      Number(oracleDatum.expiration),
+      network
+    );
     const tx = lucid.newTx().collectFrom([cdpCreatorOut], Data10.to(cdpCreatorRedeemer)).readFrom([cdpCreatorScriptRefUtxo]).pay.ToContract(
       cdpAddress,
       { kind: "inline", value: serialiseCDPDatum(cdpDatum) },
@@ -699,7 +723,7 @@ var CDPContract = class _CDPContract {
       cdpCreatorOut.address,
       { kind: "inline", value: cdpCreatorOut.datum },
       cdpCreatorOut.assets
-    ).readFrom([oracleOut, interestOracleOut, assetOut.utxo]).mintAssets(cdpTokenMintValue, Data10.to(new Constr3(0, []))).readFrom([cdpAuthTokenScriptRefUtxo]).mintAssets(iassetTokenMintValue, Data10.to(new Constr3(0, []))).readFrom([iAssetTokenScriptRefUtxo]).addSignerKey(pkh.hash).validFrom(Number(now - 100)).validTo(Number(timeValidTo));
+    ).readFrom([oracleOut, interestOracleOut, assetOut.utxo]).mintAssets(cdpTokenMintValue, Data10.to(new Constr3(0, []))).readFrom([cdpAuthTokenScriptRefUtxo]).mintAssets(iassetTokenMintValue, Data10.to(new Constr3(0, []))).readFrom([iAssetTokenScriptRefUtxo]).addSignerKey(pkh.hash).validFrom(txValidity.validFrom).validTo(txValidity.validTo);
     if (debtMintingFee > 0) {
       await CollectorContract.feeTx(
         debtMintingFee,
@@ -711,13 +735,14 @@ var CDPContract = class _CDPContract {
     }
     return tx;
   }
-  static async deposit(cdpRef, amount, params, lucid, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+  static async deposit(cdpRef, amount, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
     return _CDPContract.adjust(
       cdpRef,
       amount,
       0n,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -726,13 +751,14 @@ var CDPContract = class _CDPContract {
       treasuryRef
     );
   }
-  static async withdraw(cdpRef, amount, params, lucid, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+  static async withdraw(cdpRef, amount, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
     return _CDPContract.adjust(
       cdpRef,
       -amount,
       0n,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -741,13 +767,14 @@ var CDPContract = class _CDPContract {
       treasuryRef
     );
   }
-  static async mint(cdpRef, amount, params, lucid, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+  static async mint(cdpRef, amount, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
     return _CDPContract.adjust(
       cdpRef,
       0n,
       amount,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -756,13 +783,14 @@ var CDPContract = class _CDPContract {
       treasuryRef
     );
   }
-  static async burn(cdpRef, amount, params, lucid, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+  static async burn(cdpRef, amount, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
     return _CDPContract.adjust(
       cdpRef,
       0n,
       -amount,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -771,9 +799,10 @@ var CDPContract = class _CDPContract {
       treasuryRef
     );
   }
-  static async adjust(cdpRef, collateralAmount, mintAmount, params, lucid, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+  static async adjust(cdpRef, collateralAmount, mintAmount, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+    const network = lucid.config().network;
     const [pkh, _] = await addrDetails(lucid);
-    const now = Date.now();
+    const currentTime = BigInt(slotToUnixTime2(network, currentSlot));
     const cdp = (await lucid.utxosByOutRef([cdpRef]))[0];
     if (!cdp.datum) throw new Error("Unable to find CDP Datum");
     const cdpDatum = parseCDPDatum(cdp.datum);
@@ -800,14 +829,14 @@ var CDPContract = class _CDPContract {
     );
     const tx = lucid.newTx().collectFrom(
       [cdp],
-      Data10.to(new Constr3(0, [BigInt(now), mintAmount, collateralAmount]))
+      Data10.to(new Constr3(0, [currentTime, mintAmount, collateralAmount]))
     ).readFrom([iAsset.utxo, gov, cdpScriptRefUtxo]).addSignerKey(pkh.hash);
     if (!cdp.datum) throw new Error("Unable to find CDP Datum");
     const cdpD = parseCDPDatum(cdp.datum);
     if (!("ActiveCDPInterestTracking" in cdpD.cdpFees))
       throw new Error("Invalid CDP Fees");
     const newSnapshot = calculateUnitaryInterestSinceOracleLastUpdated(
-      BigInt(now),
+      currentTime,
       interestOracleDatum
     ) + interestOracleDatum.unitaryInterest;
     const cdpD_ = {
@@ -815,7 +844,7 @@ var CDPContract = class _CDPContract {
       mintedAmt: cdpD.mintedAmt + mintAmount,
       cdpFees: {
         ActiveCDPInterestTracking: {
-          lastSettled: BigInt(now),
+          lastSettled: currentTime,
           unitaryInterestSnapshot: newSnapshot
         }
       }
@@ -837,11 +866,13 @@ var CDPContract = class _CDPContract {
       return Promise.reject(new Error("Invalid oracle input"));
     const od = parsePriceOracleDatum(oracleRefInput.datum);
     if (!od) return Promise.reject(new Error("Invalid oracle input"));
-    const cappedValidateTo = od.expiration - 20001n;
-    const timeValidFrom = now - 1e3;
-    const timeValidTo_ = now + Number(params.cdpCreatorParams.biasTime) - 1e3;
-    const timeValidTo = cappedValidateTo <= timeValidFrom ? timeValidTo_ : Math.min(timeValidTo_, Number(cappedValidateTo));
-    tx.readFrom([oracleRefInput]).validFrom(Number(timeValidFrom)).validTo(Number(timeValidTo));
+    const txValidity = oracleExpirationAwareValidity(
+      currentSlot,
+      Number(params.cdpCreatorParams.biasTime),
+      Number(od.expiration),
+      network
+    );
+    tx.readFrom([oracleRefInput]).validFrom(txValidity.validFrom).validTo(txValidity.validTo);
     let fee = 0n;
     if (collateralAmount < 0) {
       fee += calculateFeeFromPercentage(
@@ -856,7 +887,7 @@ var CDPContract = class _CDPContract {
       );
     }
     const interestPaymentAsset = calculateAccruedInterest(
-      BigInt(now),
+      currentTime,
       cdpD.cdpFees.ActiveCDPInterestTracking.unitaryInterestSnapshot,
       cdpD.mintedAmt,
       cdpD.cdpFees.ActiveCDPInterestTracking.lastSettled,
@@ -897,9 +928,10 @@ var CDPContract = class _CDPContract {
     }
     return tx;
   }
-  static async close(cdpRef, params, lucid, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+  static async close(cdpRef, params, lucid, currentSlot, assetRef, priceOracleRef, interestOracleRef, collectorRef, govRef, treasuryRef) {
+    const network = lucid.config().network;
     const [pkh, _] = await addrDetails(lucid);
-    const now = Date.now();
+    const currentTime = BigInt(slotToUnixTime2(network, currentSlot));
     const cdp = (await lucid.utxosByOutRef([cdpRef]))[0];
     if (!cdp.datum) throw new Error("Unable to find CDP Datum");
     const cdpDatum = parseCDPDatum(cdp.datum);
@@ -921,7 +953,7 @@ var CDPContract = class _CDPContract {
     const interestOracleDatum = parseInterestOracleDatum(
       interestOracleOut.datum
     );
-    const tx = lucid.newTx().collectFrom([cdp], Data10.to(new Constr3(1, [BigInt(now)]))).readFrom([iAsset.utxo, gov, cdpScriptRefUtxo]).addSignerKey(pkh.hash);
+    const tx = lucid.newTx().collectFrom([cdp], Data10.to(new Constr3(1, [currentTime]))).readFrom([iAsset.utxo, gov, cdpScriptRefUtxo]).addSignerKey(pkh.hash);
     if (!cdp.datum) throw new Error("Unable to find CDP Datum");
     const cdpD = parseCDPDatum(cdp.datum);
     if (!("ActiveCDPInterestTracking" in cdpD.cdpFees))
@@ -935,14 +967,16 @@ var CDPContract = class _CDPContract {
     if (!oracleRefInput.datum)
       return Promise.reject(new Error("Invalid oracle input"));
     const od = parsePriceOracleDatum(oracleRefInput.datum);
-    const cappedValidateTo = od.expiration - 20001n;
-    const timeValidFrom = now - 1e3;
-    const timeValidTo_ = now + Number(params.cdpCreatorParams.biasTime) - 1e3;
-    const timeValidTo = cappedValidateTo <= timeValidFrom ? timeValidTo_ : Math.min(timeValidTo_, Number(cappedValidateTo));
-    tx.readFrom([oracleRefInput]).validFrom(Number(timeValidFrom)).validTo(Number(timeValidTo));
+    const txValidity = oracleExpirationAwareValidity(
+      currentSlot,
+      Number(params.cdpCreatorParams.biasTime),
+      Number(od.expiration),
+      network
+    );
+    tx.readFrom([oracleRefInput]).validFrom(txValidity.validFrom).validTo(txValidity.validTo);
     let fee = 0n;
     const interestPaymentAsset = calculateAccruedInterest(
-      BigInt(now),
+      currentTime,
       cdpD.cdpFees.ActiveCDPInterestTracking.unitaryInterestSnapshot,
       cdpD.mintedAmt,
       cdpD.cdpFees.ActiveCDPInterestTracking.lastSettled,
@@ -2692,32 +2726,13 @@ function castLrpParams(params) {
 
 // src/contracts/lrp.ts
 import {
-  addAssets as addAssets3
+  addAssets as addAssets3,
+  unixTimeToSlot as unixTimeToSlot2,
+  slotToUnixTime as slotToUnixTime3
 } from "@lucid-evolution/lucid";
 import { match as match5, P as P5 } from "ts-pattern";
 import { unzip, zip } from "fp-ts/lib/Array";
 import { reduceWithIndex } from "fp-ts/lib/Array";
-
-// src/helpers/price-oracle-helpers.ts
-import {
-  slotToUnixTime,
-  unixTimeToSlot
-} from "@lucid-evolution/lucid";
-function oracleExpirationAwareValidity(currentSlot, biasTime, oracleExpiration, network) {
-  const validateFrom = slotToUnixTime(network, currentSlot - 1);
-  const defaultValidateTo = validateFrom + biasTime;
-  const cappedValidateTo = slotToUnixTime(
-    network,
-    unixTimeToSlot(network, oracleExpiration) - 1
-  );
-  const isOracleActuallyExpired = cappedValidateTo <= validateFrom;
-  return {
-    validFrom: validateFrom,
-    validTo: isOracleActuallyExpired ? defaultValidateTo : Math.min(defaultValidateTo, cappedValidateTo)
-  };
-}
-
-// src/contracts/lrp.ts
 var MIN_UTXO_COLLATERAL_AMT = 2000000n;
 async function openLrp(assetTokenName, lovelacesAmt, maxPrice, lucid, lrpScriptHash, network, lrpStakeCredential) {
   const [ownPkh, _] = await addrDetails(lucid);
@@ -2748,7 +2763,7 @@ async function cancelLrp(lrpOutRef, lrpRefScriptOutRef, lucid) {
   );
   return lucid.newTx().readFrom([lrpScriptRefUtxo]).collectFrom([lrpUtxo], serialiseLrpRedeemer("Cancel")).addSigner(ownAddr);
 }
-async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutRef, iassetOutRef, lucid, lrpParams, priceOracleParams, network, currentSlot) {
+async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutRef, iassetOutRef, lucid, lrpParams, network) {
   const lrpScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([lrpRefScriptOutRef]),
     (_2) => new Error("Expected a single LRP Ref Script UTXO")
@@ -2830,13 +2845,12 @@ async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutR
       );
     }
   )(redemptionLrps);
-  const txValidity = oracleExpirationAwareValidity(
-    currentSlot,
-    Number(priceOracleParams.biasTime),
-    Number(priceOracleDatum.expiration),
-    network
-  );
-  return lucid.newTx().validFrom(txValidity.validFrom).validTo(txValidity.validTo).readFrom([lrpScriptRefUtxo]).readFrom([iassetUtxo, priceOracleUtxo]).compose(tx);
+  return lucid.newTx().validTo(
+    slotToUnixTime3(
+      network,
+      unixTimeToSlot2(network, Number(priceOracleDatum.expiration)) - 1
+    )
+  ).readFrom([lrpScriptRefUtxo]).readFrom([iassetUtxo, priceOracleUtxo]).compose(tx);
 }
 async function adjustLrp(lucid, lrpOutRef, lovelacesAdjustAmt, lrpRefScriptOutRef, lrpParams) {
   const ownAddr = await lucid.wallet().address();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Indigo SDK for interacting with Indigo endpoints via lucid-evolution",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,7 +13,6 @@
     "format": "npx prettier --write src/ tests/",
     "format:check": "npx prettier --check src/ tests/",
     "test": "vitest run",
-    "prepare": "husky",
     "lint-staged": "lint-staged"
   },
   "lint-staged": {

package/src/contracts/cdp.ts

@@ -8,6 +8,7 @@ import {
   fromText,
   LucidEvolution,
   OutRef,
+  slotToUnixTime,
   SpendingValidator,
   TxBuilder,
   UTxO,
@@ -41,6 +42,7 @@ import {
   calculateAccruedInterest,
   calculateUnitaryInterestSinceOracleLastUpdated,
 } from '../helpers/interest-oracle';
+import { oracleExpirationAwareValidity } from '../helpers/price-oracle-helpers';
 
 export class CDPContract {
   static async openPosition(
@@ -49,13 +51,16 @@ export class CDPContract {
     mintedAmount: bigint,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
     cdpCreatorRef?: OutRef,
     collectorRef?: OutRef,
-    now: number = Date.now(),
   ): Promise<TxBuilder> {
+    const network = lucid.config().network;
+    const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+
     const [pkh, skh] = await addrDetails(lucid);
     const assetOut: IAssetOutput = await (assetRef
       ? IAssetHelpers.findIAssetByRef(assetRef, lucid)
@@ -93,7 +98,7 @@ export class CDPContract {
       cdpCreatorRef
         ? await lucid.utxosByOutRef([cdpCreatorRef])
         : await lucid.utxosAtWithUnit(
-            credentialToAddress(lucid.config().network, {
+            credentialToAddress(network, {
               type: 'Script',
               hash: params.validatorHashes.cdpCreatorHash,
             }),
@@ -107,7 +112,7 @@ export class CDPContract {
         cdpOwner: pkh.hash,
         minted: mintedAmount,
         collateral: collateralAmount,
-        currentTime: BigInt(now),
+        currentTime: currentTime,
       },
     });
 
@@ -127,7 +132,7 @@ export class CDPContract {
     cdpValue[cdpToken] = 1n;
     const newSnapshot =
       calculateUnitaryInterestSinceOracleLastUpdated(
-        BigInt(now),
+        currentTime,
         interestOracleDatum,
       ) + interestOracleDatum.unitaryInterest;
     const cdpDatum: CDPContent = {
@@ -136,7 +141,7 @@ export class CDPContract {
       mintedAmt: mintedAmount,
       cdpFees: {
         ActiveCDPInterestTracking: {
-          lastSettled: BigInt(now),
+          lastSettled: currentTime,
           unitaryInterestSnapshot: newSnapshot,
         },
       },
@@ -163,14 +168,12 @@ export class CDPContract {
       (mintedAmount * oracleDatum.price.getOnChainInt) / 1_000_000n,
     );
 
-    // Oracle timestamp - 20s (length of a slot)
-    const cappedValidateTo = oracleDatum.expiration - 20_001n;
-    const timeValidFrom = now - 1_000;
-    const timeValidTo_ = now + Number(params.cdpCreatorParams.biasTime) - 1_000;
-    const timeValidTo =
-      cappedValidateTo <= timeValidFrom
-        ? timeValidTo_
-        : Math.min(timeValidTo_, Number(cappedValidateTo));
+    const txValidity = oracleExpirationAwareValidity(
+      currentSlot,
+      Number(params.cdpCreatorParams.biasTime),
+      Number(oracleDatum.expiration),
+      network,
+    );
 
     const tx = lucid
       .newTx()
@@ -192,8 +195,8 @@ export class CDPContract {
       .mintAssets(iassetTokenMintValue, Data.to(new Constr(0, [])))
       .readFrom([iAssetTokenScriptRefUtxo])
       .addSignerKey(pkh.hash)
-      .validFrom(Number(now - 100))
-      .validTo(Number(timeValidTo));
+      .validFrom(txValidity.validFrom)
+      .validTo(txValidity.validTo);
 
     if (debtMintingFee > 0) {
       await CollectorContract.feeTx(
@@ -212,6 +215,7 @@ export class CDPContract {
     amount: bigint,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
@@ -225,6 +229,7 @@ export class CDPContract {
       0n,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -239,6 +244,7 @@ export class CDPContract {
     amount: bigint,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
@@ -252,6 +258,7 @@ export class CDPContract {
       0n,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -266,6 +273,7 @@ export class CDPContract {
     amount: bigint,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
@@ -279,6 +287,7 @@ export class CDPContract {
       amount,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -293,6 +302,7 @@ export class CDPContract {
     amount: bigint,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
@@ -306,6 +316,7 @@ export class CDPContract {
       -amount,
       params,
       lucid,
+      currentSlot,
       assetRef,
       priceOracleRef,
       interestOracleRef,
@@ -321,6 +332,7 @@ export class CDPContract {
     mintAmount: bigint,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
@@ -328,9 +340,10 @@ export class CDPContract {
     govRef?: OutRef,
     treasuryRef?: OutRef,
   ): Promise<TxBuilder> {
+    const network = lucid.config().network;
     // Find Pkh, Skh
     const [pkh, _] = await addrDetails(lucid);
-    const now = Date.now();
+    const currentTime = BigInt(slotToUnixTime(network, currentSlot));
 
     // Find Outputs: iAsset Output, CDP Output, Gov Output
     const cdp = (await lucid.utxosByOutRef([cdpRef]))[0];
@@ -372,7 +385,7 @@ export class CDPContract {
       .newTx()
       .collectFrom(
         [cdp],
-        Data.to(new Constr(0, [BigInt(now), mintAmount, collateralAmount])),
+        Data.to(new Constr(0, [currentTime, mintAmount, collateralAmount])),
       )
       .readFrom([iAsset.utxo, gov, cdpScriptRefUtxo])
       .addSignerKey(pkh.hash);
@@ -384,7 +397,7 @@ export class CDPContract {
 
     const newSnapshot =
       calculateUnitaryInterestSinceOracleLastUpdated(
-        BigInt(now),
+        currentTime,
         interestOracleDatum,
       ) + interestOracleDatum.unitaryInterest;
 
@@ -393,7 +406,7 @@ export class CDPContract {
       mintedAmt: cdpD.mintedAmt + mintAmount,
       cdpFees: {
         ActiveCDPInterestTracking: {
-          lastSettled: BigInt(now),
+          lastSettled: currentTime,
           unitaryInterestSnapshot: newSnapshot,
         },
       },
@@ -424,19 +437,15 @@ export class CDPContract {
     const od = parsePriceOracleDatum(oracleRefInput.datum);
     if (!od) return Promise.reject(new Error('Invalid oracle input'));
 
-    // TODO: Sanity check: oacle expiration
-    // Oracle timestamp - 20s (length of a slot)
-    // Oracle timestamp - 20s (length of a slot)
-    const cappedValidateTo = od.expiration - 20_001n;
-    const timeValidFrom = now - 1_000;
-    const timeValidTo_ = now + Number(params.cdpCreatorParams.biasTime) - 1_000;
-    const timeValidTo =
-      cappedValidateTo <= timeValidFrom
-        ? timeValidTo_
-        : Math.min(timeValidTo_, Number(cappedValidateTo));
+    const txValidity = oracleExpirationAwareValidity(
+      currentSlot,
+      Number(params.cdpCreatorParams.biasTime),
+      Number(od.expiration),
+      network,
+    );
     tx.readFrom([oracleRefInput])
-      .validFrom(Number(timeValidFrom))
-      .validTo(Number(timeValidTo));
+      .validFrom(txValidity.validFrom)
+      .validTo(txValidity.validTo);
 
     let fee = 0n;
     if (collateralAmount < 0) {
@@ -456,7 +465,7 @@ export class CDPContract {
     // Interest payment
 
     const interestPaymentAsset = calculateAccruedInterest(
-      BigInt(now),
+      currentTime,
       cdpD.cdpFees.ActiveCDPInterestTracking.unitaryInterestSnapshot,
       cdpD.mintedAmt,
       cdpD.cdpFees.ActiveCDPInterestTracking.lastSettled,
@@ -510,6 +519,7 @@ export class CDPContract {
     cdpRef: OutRef,
     params: SystemParams,
     lucid: LucidEvolution,
+    currentSlot: number,
     assetRef?: OutRef,
     priceOracleRef?: OutRef,
     interestOracleRef?: OutRef,
@@ -517,9 +527,10 @@ export class CDPContract {
     govRef?: OutRef,
     treasuryRef?: OutRef,
   ): Promise<TxBuilder> {
+    const network = lucid.config().network;
     // Find Pkh, Skh
     const [pkh, _] = await addrDetails(lucid);
-    const now = Date.now();
+    const currentTime = BigInt(slotToUnixTime(network, currentSlot));
 
     // Find Outputs: iAsset Output, CDP Output, Gov Output
     const cdp = (await lucid.utxosByOutRef([cdpRef]))[0];
@@ -557,7 +568,7 @@ export class CDPContract {
 
     const tx = lucid
       .newTx()
-      .collectFrom([cdp], Data.to(new Constr(1, [BigInt(now)])))
+      .collectFrom([cdp], Data.to(new Constr(1, [currentTime])))
       .readFrom([iAsset.utxo, gov, cdpScriptRefUtxo])
       .addSignerKey(pkh.hash);
     if (!cdp.datum) throw new Error('Unable to find CDP Datum');
@@ -580,25 +591,21 @@ export class CDPContract {
       return Promise.reject(new Error('Invalid oracle input'));
     const od = parsePriceOracleDatum(oracleRefInput.datum);
 
-    // TODO: Sanity check: oacle expiration
-    // Oracle timestamp - 20s (length of a slot)
-    // Oracle timestamp - 20s (length of a slot)
-    const cappedValidateTo = od.expiration - 20_001n;
-    const timeValidFrom = now - 1_000;
-    const timeValidTo_ = now + Number(params.cdpCreatorParams.biasTime) - 1_000;
-    const timeValidTo =
-      cappedValidateTo <= timeValidFrom
-        ? timeValidTo_
-        : Math.min(timeValidTo_, Number(cappedValidateTo));
+    const txValidity = oracleExpirationAwareValidity(
+      currentSlot,
+      Number(params.cdpCreatorParams.biasTime),
+      Number(od.expiration),
+      network,
+    );
     tx.readFrom([oracleRefInput])
-      .validFrom(Number(timeValidFrom))
-      .validTo(Number(timeValidTo));
+      .validFrom(txValidity.validFrom)
+      .validTo(txValidity.validTo);
 
     let fee = 0n;
 
     // Interest payment
     const interestPaymentAsset = calculateAccruedInterest(
-      BigInt(now),
+      currentTime,
       cdpD.cdpFees.ActiveCDPInterestTracking.unitaryInterestSnapshot,
       cdpD.mintedAmt,
       cdpD.cdpFees.ActiveCDPInterestTracking.lastSettled,