@indigo-labs/indigo-sdk 0.6.0 → 0.6.1

package/dist/index.d.mts

@@ -3676,7 +3676,7 @@ declare function processSpRequest(stabilityPoolUtxo: UTxO, accountUtxo: UTxO, iA
 /**
  * For performance provide only the ones related to the pool's iAsset.
  */
-allE2s2sSnapshotOrefs: OutRef[], sysParams: SystemParams, lucid: LucidEvolution, currentSlot?: number): Promise<TxBuilder>;
+allE2s2sSnapshotOrefs: OutRef[], sysParams: SystemParams, lucid: LucidEvolution): Promise<TxBuilder>;
 declare function createE2s2sSnapshots(stabilityPoolOref: OutRef, sysParams: SystemParams, lucid: LucidEvolution): Promise<TxBuilder>;
 declare function annulRequest(accountUtxo: UTxO, params: SystemParams, lucid: LucidEvolution): Promise<TxBuilder>;
 

package/dist/index.d.ts

@@ -3676,7 +3676,7 @@ declare function processSpRequest(stabilityPoolUtxo: UTxO, accountUtxo: UTxO, iA
 /**
  * For performance provide only the ones related to the pool's iAsset.
  */
-allE2s2sSnapshotOrefs: OutRef[], sysParams: SystemParams, lucid: LucidEvolution, currentSlot?: number): Promise<TxBuilder>;
+allE2s2sSnapshotOrefs: OutRef[], sysParams: SystemParams, lucid: LucidEvolution): Promise<TxBuilder>;
 declare function createE2s2sSnapshots(stabilityPoolOref: OutRef, sysParams: SystemParams, lucid: LucidEvolution): Promise<TxBuilder>;
 declare function annulRequest(accountUtxo: UTxO, params: SystemParams, lucid: LucidEvolution): Promise<TxBuilder>;
 

package/dist/index.js

@@ -860,8 +860,9 @@ function calculateAccruedInterest(now, unitaryInterestSnapshot, mintedAmount, in
 
 // src/contracts/price-oracle/helpers.ts
 function oracleExpirationAwareValidity(lucid, biasTime, oracleExpiration) {
-  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-  const defaultValidateTo = validateFrom + biasTime;
+  const currentTime = lucid.slotToUnixTime(lucid.currentSlot());
+  const validateFrom = currentTime - Math.floor(biasTime / 2);
+  const defaultValidateTo = currentTime + Math.floor(biasTime / 2);
   const cappedValidateTo = lucid.slotToUnixTime(
     lucid.unixTimeToSlot(oracleExpiration) - 1
   );
@@ -2600,8 +2601,12 @@ async function batchCollectInterest(collateralAssetOref, interestCollectorOutRef
     referenceInputs,
     false
   );
-  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-  const validateTo = validateFrom + Number(params.cdpParams.biasTime);
+  const validateFrom = Number(
+    currentTime - BigInt(params.cdpParams.biasTime) / 2n
+  );
+  const validateTo = Number(
+    currentTime + BigInt(params.cdpParams.biasTime) / 2n
+  );
   const tx = lucid.newTx().validFrom(validateFrom).validTo(validateTo).readFrom(referenceInputs).collectFrom([interestCollectorUtxo], {
     kind: "selected",
     makeRedeemer: (inputIndices) => {
@@ -4107,6 +4112,8 @@ function derivePythPrice(derivedPythPrice, messageHex) {
 
 // src/contracts/iasset/helpers.ts
 var Core = __toESM(require("@evolution-sdk/evolution"));
+var MAX_PYTH_FEED_DELAY = 280 * 1e3;
+var PYTH_FEED_LEDGER_TIME_BUFFER = 20 * 1e3;
 var MAX_COLLATERAL_ASSETS_COUNT_PER_IASSET = 9;
 function attachOracle(iasset, collateralAsset, priceInfo, priceOracleOref, pythStateOref, pythMessage, pythConfig, biasTime, lucid, tx) {
   return (0, import_ts_pattern12.match)(priceInfo).returnType().with({ Delisted: import_ts_pattern12.P.any }, () => {
@@ -4187,9 +4194,8 @@ function attachOracle(iasset, collateralAsset, priceInfo, priceOracleOref, pythS
           auxiliaryData: Core.Data.fromCBORHex(import_lucid11.Data.void())
         })
       );
-      const pythMaxDelay = 280 * 1e3;
-      const validFrom = Number(pythTimestamp);
-      const validTo = Number(pythTimestamp + pythMaxDelay);
+      const validFrom = Number(pythTimestamp - PYTH_FEED_LEDGER_TIME_BUFFER);
+      const validTo = Number(pythTimestamp + MAX_PYTH_FEED_DELAY);
       return {
         interval: {
           validFrom,
@@ -4673,8 +4679,12 @@ async function closeCdp(cdpOref, collateralAssetOref, interestOracleOref, intere
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
   );
-  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-  const validateTo = validateFrom + Number(sysParams.cdpCreatorParams.biasTime);
+  const validateFrom = Number(
+    currentTime - BigInt(sysParams.cdpParams.biasTime) / 2n
+  );
+  const validateTo = Number(
+    currentTime + BigInt(sysParams.cdpParams.biasTime) / 2n
+  );
   const tx = lucid.newTx().readFrom([
     cdpRefScriptUtxo,
     iAssetTokenPolicyRefScriptUtxo,
@@ -4869,8 +4879,12 @@ async function redeemCdp(attemptedRedemptionIAssetAmt, cdpOref, iassetOref, coll
     referenceInputs.push(priceOracleUtxo);
     tx.validFrom(txValidity.validFrom).validTo(txValidity.validTo);
   } else {
-    const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-    const validateTo = validateFrom + Number(sysParams.cdpCreatorParams.biasTime);
+    const validateFrom = Number(
+      currentTime - BigInt(sysParams.cdpParams.biasTime) / 2n
+    );
+    const validateTo = Number(
+      currentTime + BigInt(sysParams.cdpParams.biasTime) / 2n
+    );
     tx.validFrom(validateFrom).validTo(validateTo);
   }
   const partialRedemptionFee = import_fp_ts13.function.pipe(
@@ -8377,9 +8391,8 @@ async function requestSpAccountClosure(accountUtxo, sysParams, lucid, maxTxFee =
     )
   ).addSignerKey((0, import_lucid47.toHex)(oldAccountDatum.owner));
 }
-async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, txFee, currentSlot) {
-  const slot = currentSlot !== void 0 ? currentSlot : lucid.currentSlot();
-  const currentTime = BigInt(lucid.slotToUnixTime(slot));
+async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, txFee) {
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
   const stabilityPoolScriptRef = (0, import_cardano_offchain_common24.matchSingle)(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(
@@ -8395,8 +8408,13 @@ async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetU
     getInlineDatumOrThrow(stabilityPoolUtxo)
   );
   const baseRefInputs = [iAssetUtxo, stabilityPoolScriptRef];
-  const validFrom = lucid.slotToUnixTime(slot - 1);
-  const tx = lucid.newTx().validFrom(validFrom).validTo(validFrom + sysParams.stabilityPoolParams.accountProcessingBiasMs).readFrom(baseRefInputs).collectFrom([stabilityPoolUtxo], {
+  const validateFrom = Number(
+    currentTime - BigInt(sysParams.stabilityPoolParams.accountProcessingBiasMs) / 2n
+  );
+  const validateTo = Number(
+    currentTime + BigInt(sysParams.stabilityPoolParams.accountProcessingBiasMs) / 2n
+  );
+  const tx = lucid.newTx().validFrom(validateFrom).validTo(validateTo).readFrom(baseRefInputs).collectFrom([stabilityPoolUtxo], {
     kind: "selected",
     inputs: [stabilityPoolUtxo, accountUtxo],
     makeRedeemer: (indices) => serialiseStabilityPoolRedeemer({
@@ -8767,7 +8785,7 @@ async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetU
   }).exhaustive();
   return tx;
 }
-async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, currentSlot) {
+async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid) {
   const draftTx = processSpRequestAuxiliary(
     stabilityPoolUtxo,
     accountUtxo,
@@ -8776,8 +8794,7 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
     sysParams,
     lucid,
     // Placeholder transation fee
-    1n,
-    currentSlot
+    1n
   );
   const fee = (await (await draftTx).complete()).toTransaction().body().fee();
   return processSpRequestAuxiliary(
@@ -8787,8 +8804,7 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
     allE2s2sSnapshotOrefs,
     sysParams,
     lucid,
-    fee,
-    currentSlot
+    fee
   );
 }
 async function createE2s2sSnapshots(stabilityPoolOref, sysParams, lucid) {

package/dist/index.mjs

@@ -465,8 +465,9 @@ function calculateAccruedInterest(now, unitaryInterestSnapshot, mintedAmount, in
 
 // src/contracts/price-oracle/helpers.ts
 function oracleExpirationAwareValidity(lucid, biasTime, oracleExpiration) {
-  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-  const defaultValidateTo = validateFrom + biasTime;
+  const currentTime = lucid.slotToUnixTime(lucid.currentSlot());
+  const validateFrom = currentTime - Math.floor(biasTime / 2);
+  const defaultValidateTo = currentTime + Math.floor(biasTime / 2);
   const cappedValidateTo = lucid.slotToUnixTime(
     lucid.unixTimeToSlot(oracleExpiration) - 1
   );
@@ -2244,8 +2245,12 @@ async function batchCollectInterest(collateralAssetOref, interestCollectorOutRef
     referenceInputs,
     false
   );
-  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-  const validateTo = validateFrom + Number(params.cdpParams.biasTime);
+  const validateFrom = Number(
+    currentTime - BigInt(params.cdpParams.biasTime) / 2n
+  );
+  const validateTo = Number(
+    currentTime + BigInt(params.cdpParams.biasTime) / 2n
+  );
   const tx = lucid.newTx().validFrom(validateFrom).validTo(validateTo).readFrom(referenceInputs).collectFrom([interestCollectorUtxo], {
     kind: "selected",
     makeRedeemer: (inputIndices) => {
@@ -3788,6 +3793,8 @@ function derivePythPrice(derivedPythPrice, messageHex) {
 
 // src/contracts/iasset/helpers.ts
 import * as Core from "@evolution-sdk/evolution";
+var MAX_PYTH_FEED_DELAY = 280 * 1e3;
+var PYTH_FEED_LEDGER_TIME_BUFFER = 20 * 1e3;
 var MAX_COLLATERAL_ASSETS_COUNT_PER_IASSET = 9;
 function attachOracle(iasset, collateralAsset, priceInfo, priceOracleOref, pythStateOref, pythMessage, pythConfig, biasTime, lucid, tx) {
   return match11(priceInfo).returnType().with({ Delisted: P12.any }, () => {
@@ -3868,9 +3875,8 @@ function attachOracle(iasset, collateralAsset, priceInfo, priceOracleOref, pythS
           auxiliaryData: Core.Data.fromCBORHex(Data18.void())
         })
       );
-      const pythMaxDelay = 280 * 1e3;
-      const validFrom = Number(pythTimestamp);
-      const validTo = Number(pythTimestamp + pythMaxDelay);
+      const validFrom = Number(pythTimestamp - PYTH_FEED_LEDGER_TIME_BUFFER);
+      const validTo = Number(pythTimestamp + MAX_PYTH_FEED_DELAY);
       return {
         interval: {
           validFrom,
@@ -4357,8 +4363,12 @@ async function closeCdp(cdpOref, collateralAssetOref, interestOracleOref, intere
   const interestOracleDatum = parseInterestOracleDatum(
     getInlineDatumOrThrow(interestOracleUtxo)
   );
-  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-  const validateTo = validateFrom + Number(sysParams.cdpCreatorParams.biasTime);
+  const validateFrom = Number(
+    currentTime - BigInt(sysParams.cdpParams.biasTime) / 2n
+  );
+  const validateTo = Number(
+    currentTime + BigInt(sysParams.cdpParams.biasTime) / 2n
+  );
   const tx = lucid.newTx().readFrom([
     cdpRefScriptUtxo,
     iAssetTokenPolicyRefScriptUtxo,
@@ -4553,8 +4563,12 @@ async function redeemCdp(attemptedRedemptionIAssetAmt, cdpOref, iassetOref, coll
     referenceInputs.push(priceOracleUtxo);
     tx.validFrom(txValidity.validFrom).validTo(txValidity.validTo);
   } else {
-    const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
-    const validateTo = validateFrom + Number(sysParams.cdpCreatorParams.biasTime);
+    const validateFrom = Number(
+      currentTime - BigInt(sysParams.cdpParams.biasTime) / 2n
+    );
+    const validateTo = Number(
+      currentTime + BigInt(sysParams.cdpParams.biasTime) / 2n
+    );
     tx.validFrom(validateFrom).validTo(validateTo);
   }
   const partialRedemptionFee = F12.pipe(
@@ -8160,9 +8174,8 @@ async function requestSpAccountClosure(accountUtxo, sysParams, lucid, maxTxFee =
     )
   ).addSignerKey(toHex12(oldAccountDatum.owner));
 }
-async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, txFee, currentSlot) {
-  const slot = currentSlot !== void 0 ? currentSlot : lucid.currentSlot();
-  const currentTime = BigInt(lucid.slotToUnixTime(slot));
+async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, txFee) {
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
   const stabilityPoolScriptRef = matchSingle5(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(
@@ -8178,8 +8191,13 @@ async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetU
     getInlineDatumOrThrow(stabilityPoolUtxo)
   );
   const baseRefInputs = [iAssetUtxo, stabilityPoolScriptRef];
-  const validFrom = lucid.slotToUnixTime(slot - 1);
-  const tx = lucid.newTx().validFrom(validFrom).validTo(validFrom + sysParams.stabilityPoolParams.accountProcessingBiasMs).readFrom(baseRefInputs).collectFrom([stabilityPoolUtxo], {
+  const validateFrom = Number(
+    currentTime - BigInt(sysParams.stabilityPoolParams.accountProcessingBiasMs) / 2n
+  );
+  const validateTo = Number(
+    currentTime + BigInt(sysParams.stabilityPoolParams.accountProcessingBiasMs) / 2n
+  );
+  const tx = lucid.newTx().validFrom(validateFrom).validTo(validateTo).readFrom(baseRefInputs).collectFrom([stabilityPoolUtxo], {
     kind: "selected",
     inputs: [stabilityPoolUtxo, accountUtxo],
     makeRedeemer: (indices) => serialiseStabilityPoolRedeemer({
@@ -8550,7 +8568,7 @@ async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetU
   }).exhaustive();
   return tx;
 }
-async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, currentSlot) {
+async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid) {
   const draftTx = processSpRequestAuxiliary(
     stabilityPoolUtxo,
     accountUtxo,
@@ -8559,8 +8577,7 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
     sysParams,
     lucid,
     // Placeholder transation fee
-    1n,
-    currentSlot
+    1n
   );
   const fee = (await (await draftTx).complete()).toTransaction().body().fee();
   return processSpRequestAuxiliary(
@@ -8570,8 +8587,7 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
     allE2s2sSnapshotOrefs,
     sysParams,
     lucid,
-    fee,
-    currentSlot
+    fee
   );
 }
 async function createE2s2sSnapshots(stabilityPoolOref, sysParams, lucid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Indigo SDK for interacting with Indigo endpoints via lucid-evolution",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,7 +41,7 @@
     "@indigo-labs/cardano-offchain-common": "1.5.2",
     "@evolution-sdk/evolution": "^0.3.22",
     "@harmoniclabs/crypto": "^0.3.0",
-    "@lucid-evolution/lucid": "0.6.2",
+    "@lucid-evolution/lucid": "0.6.4",
     "@noble/ed25519": "^3.0.0",
     "@pythnetwork/pyth-lazer-sdk": "^6.0.0",
     "decimal.js": "^10.6.0",