@indigo-labs/indigo-sdk 0.3.27 → 0.3.28

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as _lucid_evolution_lucid from '@lucid-evolution/lucid';
-import { Data, UTxO, Credential, OutRef, LucidEvolution, TxBuilder, Network, WithdrawalValidator, SpendingValidator, Assets, MintingPolicy, Address, PolicyId, ScriptHash, ProtocolParameters, OutputDatum, Script, Datum } from '@lucid-evolution/lucid';
+import { Data, UTxO, Credential, OutRef, LucidEvolution, TxBuilder, Assets, Network, WithdrawalValidator, SpendingValidator, MintingPolicy, Address, PolicyId, ScriptHash, ProtocolParameters, OutputDatum, Script, Datum } from '@lucid-evolution/lucid';
 import { AssetClass } from '@3rd-eye-labs/cardano-offchain-common';
 import * as Core from '@evolution-sdk/evolution';
 import { TSchema, Schema, Data as Data$1 } from '@evolution-sdk/evolution';
@@ -822,10 +822,7 @@ declare function rationalToFloat(a: Rational): number;
  * Amount of iasset equal in value to the given number of collateral amount.
  */
 declare function iassetValueOfCollateral(collateralAmt: bigint, oraclePrice: Rational): bigint;
-/**
- * This is mostly for debugging purposes.
- */
-declare function cdpCollateralRatioPercentage(currentSlot: number, iassetPrice: Rational, cdpUtxo: UTxO, cdpContent: CDPContent, interestOracleDatum: InterestOracleDatum, network: Network): number;
+declare function cdpCollateralRatioPercentage(currentSlot: number, iassetPrice: Rational, cdpUtxoAssets: Assets, cdpContent: CDPContent, interestOracleDatum: InterestOracleDatum, network: Network): number;
 /**
  * The amount of iassets to redeem to reach the RMR.
  */

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _lucid_evolution_lucid from '@lucid-evolution/lucid';
-import { Data, UTxO, Credential, OutRef, LucidEvolution, TxBuilder, Network, WithdrawalValidator, SpendingValidator, Assets, MintingPolicy, Address, PolicyId, ScriptHash, ProtocolParameters, OutputDatum, Script, Datum } from '@lucid-evolution/lucid';
+import { Data, UTxO, Credential, OutRef, LucidEvolution, TxBuilder, Assets, Network, WithdrawalValidator, SpendingValidator, MintingPolicy, Address, PolicyId, ScriptHash, ProtocolParameters, OutputDatum, Script, Datum } from '@lucid-evolution/lucid';
 import { AssetClass } from '@3rd-eye-labs/cardano-offchain-common';
 import * as Core from '@evolution-sdk/evolution';
 import { TSchema, Schema, Data as Data$1 } from '@evolution-sdk/evolution';
@@ -822,10 +822,7 @@ declare function rationalToFloat(a: Rational): number;
  * Amount of iasset equal in value to the given number of collateral amount.
  */
 declare function iassetValueOfCollateral(collateralAmt: bigint, oraclePrice: Rational): bigint;
-/**
- * This is mostly for debugging purposes.
- */
-declare function cdpCollateralRatioPercentage(currentSlot: number, iassetPrice: Rational, cdpUtxo: UTxO, cdpContent: CDPContent, interestOracleDatum: InterestOracleDatum, network: Network): number;
+declare function cdpCollateralRatioPercentage(currentSlot: number, iassetPrice: Rational, cdpUtxoAssets: Assets, cdpContent: CDPContent, interestOracleDatum: InterestOracleDatum, network: Network): number;
 /**
  * The amount of iassets to redeem to reach the RMR.
  */

package/dist/index.js

@@ -836,7 +836,7 @@ function iassetValueOfCollateral(collateralAmt, oraclePrice) {
     rationalDiv(rationalFromInt(collateralAmt), oraclePrice)
   );
 }
-function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxo, cdpContent, interestOracleDatum, network) {
+function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxoAssets, cdpContent, interestOracleDatum, network) {
   const currentTime = BigInt((0, import_lucid4.slotToUnixTime)(network, currentSlot));
   return (0, import_ts_pattern5.match)(cdpContent.cdpFees).with({ ActiveCDPInterestTracking: import_ts_pattern5.P.select() }, (interest) => {
     const interestAmt = calculateAccruedInterest(
@@ -847,7 +847,7 @@ function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxo, cdpCont
       interestOracleDatum
     );
     const collateral = (0, import_cardano_offchain_common.assetClassValueOf)(
-      cdpUtxo.assets,
+      cdpUtxoAssets,
       cdpContent.collateralAsset
     );
     const ratio = rationalDiv(
@@ -857,7 +857,7 @@ function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxo, cdpCont
         iassetPrice
       )
     );
-    return Number(ratio.numerator * 100n / ratio.denominator);
+    return Number(ratio.numerator) * 100 / Number(ratio.denominator);
   }).with({ FrozenCDPAccumulatedFees: import_ts_pattern5.P.any }, () => 0).exhaustive();
 }
 function calculateIAssetRedemptionAmt(collateralAmt, mintedAmt, price, rmr) {

package/dist/index.mjs

@@ -471,7 +471,7 @@ function iassetValueOfCollateral(collateralAmt, oraclePrice) {
     rationalDiv(rationalFromInt(collateralAmt), oraclePrice)
   );
 }
-function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxo, cdpContent, interestOracleDatum, network) {
+function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxoAssets, cdpContent, interestOracleDatum, network) {
   const currentTime = BigInt(slotToUnixTime2(network, currentSlot));
   return match4(cdpContent.cdpFees).with({ ActiveCDPInterestTracking: P4.select() }, (interest) => {
     const interestAmt = calculateAccruedInterest(
@@ -482,7 +482,7 @@ function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxo, cdpCont
       interestOracleDatum
     );
     const collateral = assetClassValueOf(
-      cdpUtxo.assets,
+      cdpUtxoAssets,
       cdpContent.collateralAsset
     );
     const ratio = rationalDiv(
@@ -492,7 +492,7 @@ function cdpCollateralRatioPercentage(currentSlot, iassetPrice, cdpUtxo, cdpCont
         iassetPrice
       )
     );
-    return Number(ratio.numerator * 100n / ratio.denominator);
+    return Number(ratio.numerator) * 100 / Number(ratio.denominator);
   }).with({ FrozenCDPAccumulatedFees: P4.any }, () => 0).exhaustive();
 }
 function calculateIAssetRedemptionAmt(collateralAmt, mintedAmt, price, rmr) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "description": "Indigo SDK for interacting with Indigo endpoints via lucid-evolution",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/contracts/cdp/helpers.ts

@@ -1,4 +1,4 @@
-import { Network, slotToUnixTime, UTxO } from '@lucid-evolution/lucid';
+import { Assets, Network, slotToUnixTime } from '@lucid-evolution/lucid';
 import { calculateAccruedInterest } from '../interest-oracle/helpers';
 import { match, P } from 'ts-pattern';
 import { calculateFeeFromRatio } from '../../utils/indigo-helpers';
@@ -29,13 +29,10 @@ export function iassetValueOfCollateral(
   );
 }
 
-/**
- * This is mostly for debugging purposes.
- */
 export function cdpCollateralRatioPercentage(
   currentSlot: number,
   iassetPrice: Rational,
-  cdpUtxo: UTxO,
+  cdpUtxoAssets: Assets,
   cdpContent: CDPContent,
   interestOracleDatum: InterestOracleDatum,
   network: Network,
@@ -53,7 +50,7 @@ export function cdpCollateralRatioPercentage(
       );
 
       const collateral = assetClassValueOf(
-        cdpUtxo.assets,
+        cdpUtxoAssets,
         cdpContent.collateralAsset,
       );
 
@@ -65,7 +62,7 @@ export function cdpCollateralRatioPercentage(
         ),
       );
 
-      return Number((ratio.numerator * 100n) / ratio.denominator);
+      return (Number(ratio.numerator) * 100) / Number(ratio.denominator);
     })
     .with({ FrozenCDPAccumulatedFees: P.any }, () => 0)
     .exhaustive();

package/tests/cdp/cdp-queries.ts

@@ -427,7 +427,7 @@ export async function findCdpCR(
   return cdpCollateralRatioPercentage(
     slot,
     adjustedPrice,
-    cdp.utxo,
+    cdp.utxo.assets,
     cdp.datum,
     await findInterestDatum(
       lucid,

package/tests/rob/rob-leverage.test.ts

@@ -1412,7 +1412,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -1555,7 +1555,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -1667,7 +1667,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -1790,7 +1790,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -1913,7 +1913,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -2036,7 +2036,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -2159,7 +2159,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -2298,7 +2298,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -2444,7 +2444,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),
@@ -2581,7 +2581,7 @@ describe('LRP leverage', () => {
       cdpCollateralRatioPercentage(
         context.emulator.slot,
         parsePriceOracleDatum(getInlineDatumOrThrow(priceOracleUtxo)).price,
-        res.utxo,
+        res.utxo.assets,
         res.datum,
         parseInterestOracleDatum(
           getInlineDatumOrThrow(orefs.interestOracleUtxo),