@indigo-labs/indigo-sdk 0.3.27 → 0.4.0

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) {
@@ -10504,15 +10504,22 @@ async function initPythConfig(lucid, initialAssets, pythStateAsset) {
           lucid,
           pythFeedValidator
         );
-        await runAndAwaitTxBuilder(
-          lucid,
-          lucid.newTx().register.Stake(
-            (0, import_lucid65.credentialToRewardAddress)(lucid.config().network, {
-              hash: (0, import_lucid65.validatorToScriptHash)(pythFeedValidator),
-              type: "Script"
-            })
-          )
-        );
+        try {
+          await runAndAwaitTxBuilder(
+            lucid,
+            lucid.newTx().register.Stake(
+              (0, import_lucid65.credentialToRewardAddress)(lucid.config().network, {
+                hash: (0, import_lucid65.validatorToScriptHash)(pythFeedValidator),
+                type: "Script"
+              })
+            )
+          );
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          if (!message.includes("StakeKeyRegisteredDELEG") && !message.includes("Trying to re-register some already known credentials.")) {
+            throw error;
+          }
+        }
         const key = `${asset.name}/${(0, import_lucid65.toHex)(collateral.collateralAsset.currencySymbol)}.${(0, import_lucid65.toHex)(collateral.collateralAsset.tokenName)}`;
         return {
           [key]: {
@@ -10702,7 +10709,14 @@ async function init(lucid, defaultInitialAssets, currentSlot, mkPythBasedAssets
     lucid.config().network,
     (0, import_lucid65.scriptHashToCredential)(cdpRedeemValHash)
   );
-  await submitTx(lucid, lucid.newTx().register.Stake(cdpRedeemRewardAddr));
+  try {
+    await runAndAwaitTxBuilder(lucid, lucid.newTx().register.Stake(cdpRedeemRewardAddr));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (!message.includes("StakeKeyRegisteredDELEG") && !message.includes("Trying to re-register some already known credentials.")) {
+      throw error;
+    }
+  }
   const cdpParams = {
     cdpAuthToken: toSystemParamsAsset(cdpToken),
     cdpAssetSymbol: { unCurrencySymbol: assetSymbol },
@@ -10886,7 +10900,7 @@ async function init(lucid, defaultInitialAssets, currentSlot, mkPythBasedAssets
     lucid,
     govParams,
     govNftAsset,
-    defaultInitialAssets,
+    initialAssets,
     protocolParams
   );
   const robParams = {

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) {
@@ -10401,15 +10401,22 @@ async function initPythConfig(lucid, initialAssets, pythStateAsset) {
           lucid,
           pythFeedValidator
         );
-        await runAndAwaitTxBuilder(
-          lucid,
-          lucid.newTx().register.Stake(
-            credentialToRewardAddress4(lucid.config().network, {
-              hash: validatorToScriptHash5(pythFeedValidator),
-              type: "Script"
-            })
-          )
-        );
+        try {
+          await runAndAwaitTxBuilder(
+            lucid,
+            lucid.newTx().register.Stake(
+              credentialToRewardAddress4(lucid.config().network, {
+                hash: validatorToScriptHash5(pythFeedValidator),
+                type: "Script"
+              })
+            )
+          );
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          if (!message.includes("StakeKeyRegisteredDELEG") && !message.includes("Trying to re-register some already known credentials.")) {
+            throw error;
+          }
+        }
         const key = `${asset.name}/${toHex16(collateral.collateralAsset.currencySymbol)}.${toHex16(collateral.collateralAsset.tokenName)}`;
         return {
           [key]: {
@@ -10599,7 +10606,14 @@ async function init(lucid, defaultInitialAssets, currentSlot, mkPythBasedAssets
     lucid.config().network,
     scriptHashToCredential4(cdpRedeemValHash)
   );
-  await submitTx(lucid, lucid.newTx().register.Stake(cdpRedeemRewardAddr));
+  try {
+    await runAndAwaitTxBuilder(lucid, lucid.newTx().register.Stake(cdpRedeemRewardAddr));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (!message.includes("StakeKeyRegisteredDELEG") && !message.includes("Trying to re-register some already known credentials.")) {
+      throw error;
+    }
+  }
   const cdpParams = {
     cdpAuthToken: toSystemParamsAsset(cdpToken),
     cdpAssetSymbol: { unCurrencySymbol: assetSymbol },
@@ -10783,7 +10797,7 @@ async function init(lucid, defaultInitialAssets, currentSlot, mkPythBasedAssets
     lucid,
     govParams,
     govNftAsset,
-    defaultInitialAssets,
+    initialAssets,
     protocolParams
   );
   const robParams = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.3.27",
+  "version": "0.4.0",
   "description": "Indigo SDK for interacting with Indigo endpoints via lucid-evolution",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -41,10 +41,10 @@
   "license": "MIT",
   "packageManager": "pnpm@10.33.4",
   "dependencies": {
-    "@3rd-eye-labs/cardano-offchain-common": "1.2.0",
+    "@3rd-eye-labs/cardano-offchain-common": "1.4.7",
     "@evolution-sdk/evolution": "^0.3.22",
     "@harmoniclabs/crypto": "^0.3.0",
-    "@lucid-evolution/lucid": "^0.4.29",
+    "@lucid-evolution/lucid": "0.5.5",
     "@noble/ed25519": "^3.0.0",
     "@pythnetwork/pyth-lazer-sdk": "^6.0.0",
     "decimal.js": "^10.6.0",

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/src/contracts/initialize/actions.ts

@@ -69,7 +69,6 @@ import { mkStabilityPoolValidatorFromSP } from '../stability-pool/scripts';
 import { mkTreasuryValidatorFromSP } from '../treasury/scripts';
 import { mkCDPCreatorValidatorFromSP } from '../cdp-creator/scripts';
 import { mkGovValidatorFromSP } from '../gov/scripts';
-import { submitTx } from '../../utils/lucid-utils';
 import {
   deriveAuthToken,
   initScriptRef,
@@ -121,17 +120,26 @@ export async function initPythConfig(
             pythFeedValidator,
           );
 
-          // Register the stake key for pyth feed validator.
-          await runAndAwaitTxBuilder(
-            lucid,
-            lucid.newTx().register.Stake(
-              credentialToRewardAddress(lucid.config().network!, {
-                hash: validatorToScriptHash(pythFeedValidator),
-                type: 'Script',
-              }),
-            ),
-          );
-
+          try {
+            // Register the stake key for pyth feed validator.
+            await runAndAwaitTxBuilder(
+              lucid,
+              lucid.newTx().register.Stake(
+                credentialToRewardAddress(lucid.config().network!, {
+                  hash: validatorToScriptHash(pythFeedValidator),
+                  type: 'Script',
+                }),
+              ),
+            );
+
+          } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (
+              !message.includes('StakeKeyRegisteredDELEG') && !message.includes('Trying to re-register some already known credentials.')
+            ) {
+              throw error;
+            }
+          }
           const key = `${asset.name}/${toHex(collateral.collateralAsset.currencySymbol)}.${toHex(collateral.collateralAsset.tokenName)}`;
 
           return {
@@ -368,8 +376,16 @@ export async function init(
     scriptHashToCredential(cdpRedeemValHash),
   );
 
-  await submitTx(lucid, lucid.newTx().register.Stake(cdpRedeemRewardAddr));
-
+  try {
+    await runAndAwaitTxBuilder(lucid, lucid.newTx().register.Stake(cdpRedeemRewardAddr));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (
+      !message.includes('StakeKeyRegisteredDELEG') && !message.includes('Trying to re-register some already known credentials.')
+    ) {
+      throw error;
+    }
+  }
   const cdpParams: CdpParamsSP = {
     cdpAuthToken: toSystemParamsAsset(cdpToken),
     cdpAssetSymbol: { unCurrencySymbol: assetSymbol },
@@ -578,7 +594,7 @@ export async function init(
     lucid,
     govParams,
     govNftAsset,
-    defaultInitialAssets,
+    initialAssets,
     protocolParams,
   );
 

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),