@indigo-labs/indigo-sdk 0.2.29 → 0.2.30

package/dist/index.js

@@ -908,7 +908,9 @@ var CDPCreatorRedeemerSchema = import_lucid11.Data.Enum([
 ]);
 var CDPCreatorRedeemer = CDPCreatorRedeemerSchema;
 function serialiseCDPCreatorRedeemer(params) {
-  return import_lucid11.Data.to(params, CDPCreatorRedeemer, { canonical: true });
+  return import_lucid11.Data.to(params, CDPCreatorRedeemer, {
+    canonical: true
+  });
 }
 function serialiseCDPCreatorDatum() {
   return import_lucid11.Data.void();
@@ -1161,14 +1163,18 @@ function serialiseStabilityPoolRedeemer(r) {
     StabilityPoolRedeemerSchema,
     DEFAULT_SCHEMA_OPTIONS
   ).toCBORHex(r);
-  return import_lucid14.Data.to(import_lucid14.Data.from(rdmr, typeof import_lucid14.Data), typeof import_lucid14.Data, { canonical: false });
+  return import_lucid14.Data.to(import_lucid14.Data.from(rdmr, typeof import_lucid14.Data), typeof import_lucid14.Data, {
+    canonical: false
+  });
 }
 function serialiseStabilityPoolDatum(d, useIndefiniteMaps = false) {
   const datum = import_evolution2.Core.Data.withSchema(StabilityPoolDatumSchema, {
     ...DEFAULT_SCHEMA_OPTIONS,
     useIndefiniteMaps
   }).toCBORHex(d);
-  return import_lucid14.Data.to(import_lucid14.Data.from(datum, typeof import_lucid14.Data), typeof import_lucid14.Data, { canonical: false });
+  return import_lucid14.Data.to(import_lucid14.Data.from(datum, typeof import_lucid14.Data), typeof import_lucid14.Data, {
+    canonical: false
+  });
 }
 function parseStabilityPoolDatum(datum) {
   return (0, import_ts_pattern5.match)(
@@ -1692,6 +1698,19 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
     Number(priceOracleDatum.expiration),
     network
   );
+  const interestAdaAmt = (0, import_ts_pattern7.match)(cdpDatum.cdpFees).with({ FrozenCDPAccumulatedFees: import_ts_pattern7.P.any }, () => {
+    throw new Error("CDP fees wrong");
+  }).with({ ActiveCDPInterestTracking: import_ts_pattern7.P.select() }, (interest) => {
+    const interestPaymentIAssetAmt = calculateAccruedInterest(
+      currentTime,
+      interest.unitaryInterestSnapshot,
+      cdpDatum.mintedAmt,
+      interest.lastSettled,
+      interestOracleDatum
+    );
+    return interestPaymentIAssetAmt * priceOracleDatum.price.getOnChainInt / 1000000n;
+  }).exhaustive();
+  const newCollateralAmount = collateralAmount - interestAdaAmt;
   const tx = lucid.newTx().validFrom(txValidity.validFrom).validTo(txValidity.validTo).collectFrom(
     [cdpUtxo],
     serialiseCdpRedeemer({
@@ -1719,7 +1738,7 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
         }
       })
     },
-    (0, import_lucid19.addAssets)(cdpUtxo.assets, mkLovelacesOf(collateralAmount))
+    (0, import_lucid19.addAssets)(cdpUtxo.assets, mkLovelacesOf(newCollateralAmount))
   );
   if (!cdpDatum.cdpOwner) {
     throw new Error("Expected active CDP");
@@ -1746,18 +1765,6 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
       import_lucid19.Data.void()
     );
   }
-  const interestAdaAmt = (0, import_ts_pattern7.match)(cdpDatum.cdpFees).with({ FrozenCDPAccumulatedFees: import_ts_pattern7.P.any }, () => {
-    throw new Error("CDP fees wrong");
-  }).with({ ActiveCDPInterestTracking: import_ts_pattern7.P.select() }, (interest) => {
-    const interestPaymentIAssetAmt = calculateAccruedInterest(
-      currentTime,
-      interest.unitaryInterestSnapshot,
-      cdpDatum.mintedAmt,
-      interest.lastSettled,
-      interestOracleDatum
-    );
-    return interestPaymentIAssetAmt * priceOracleDatum.price.getOnChainInt / 1000000n;
-  }).exhaustive();
   const interestCollectorAdaAmt = calculateFeeFromPercentage(
     iassetDatum.interestCollectorPortionPercentage,
     interestAdaAmt
@@ -2730,7 +2737,9 @@ var StakingRedeemerSchema = import_lucid26.Data.Enum([
 ]);
 var StakingRedeemer = StakingRedeemerSchema;
 function serialiseStakingRedeemer(redeemer) {
-  const rdmr = import_lucid26.Data.to(redeemer, StakingRedeemer, { canonical: false });
+  const rdmr = import_lucid26.Data.to(redeemer, StakingRedeemer, {
+    canonical: false
+  });
   return rdmr;
 }
 function castStakingParams(params) {
@@ -2800,7 +2809,9 @@ function serialiseStakingDatum(d) {
     StakingDatumSchema,
     DEFAULT_SCHEMA_OPTIONS
   ).toCBORHex(d);
-  return import_lucid27.Data.to(import_lucid27.Data.from(datum, typeof import_lucid27.Data), typeof import_lucid27.Data, { canonical: false });
+  return import_lucid27.Data.to(import_lucid27.Data.from(datum, typeof import_lucid27.Data), typeof import_lucid27.Data, {
+    canonical: false
+  });
 }
 
 // src/contracts/staking/helpers.ts
@@ -5423,7 +5434,7 @@ function serialiseLrpDatum(datum) {
   return import_lucid48.Data.to(datum, LRPDatum);
 }
 function serialiseLrpRedeemer(redeemer) {
-  return import_lucid48.Data.to(redeemer, LRPRedeemer);
+  return import_lucid48.Data.to(redeemer, LRPRedeemer, { canonical: true });
 }
 function castLrpParams(params) {
   return import_lucid48.Data.castTo(params, LRPParams);

package/dist/index.mjs

@@ -674,7 +674,9 @@ var CDPCreatorRedeemerSchema = Data8.Enum([
 ]);
 var CDPCreatorRedeemer = CDPCreatorRedeemerSchema;
 function serialiseCDPCreatorRedeemer(params) {
-  return Data8.to(params, CDPCreatorRedeemer, { canonical: true });
+  return Data8.to(params, CDPCreatorRedeemer, {
+    canonical: true
+  });
 }
 function serialiseCDPCreatorDatum() {
   return Data8.void();
@@ -927,14 +929,18 @@ function serialiseStabilityPoolRedeemer(r) {
     StabilityPoolRedeemerSchema,
     DEFAULT_SCHEMA_OPTIONS
   ).toCBORHex(r);
-  return Data9.to(Data9.from(rdmr, typeof Data9), typeof Data9, { canonical: false });
+  return Data9.to(Data9.from(rdmr, typeof Data9), typeof Data9, {
+    canonical: false
+  });
 }
 function serialiseStabilityPoolDatum(d, useIndefiniteMaps = false) {
   const datum = EvoCore2.Data.withSchema(StabilityPoolDatumSchema, {
     ...DEFAULT_SCHEMA_OPTIONS,
     useIndefiniteMaps
   }).toCBORHex(d);
-  return Data9.to(Data9.from(datum, typeof Data9), typeof Data9, { canonical: false });
+  return Data9.to(Data9.from(datum, typeof Data9), typeof Data9, {
+    canonical: false
+  });
 }
 function parseStabilityPoolDatum(datum) {
   return match5(
@@ -1463,6 +1469,19 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
     Number(priceOracleDatum.expiration),
     network
   );
+  const interestAdaAmt = match7(cdpDatum.cdpFees).with({ FrozenCDPAccumulatedFees: P6.any }, () => {
+    throw new Error("CDP fees wrong");
+  }).with({ ActiveCDPInterestTracking: P6.select() }, (interest) => {
+    const interestPaymentIAssetAmt = calculateAccruedInterest(
+      currentTime,
+      interest.unitaryInterestSnapshot,
+      cdpDatum.mintedAmt,
+      interest.lastSettled,
+      interestOracleDatum
+    );
+    return interestPaymentIAssetAmt * priceOracleDatum.price.getOnChainInt / 1000000n;
+  }).exhaustive();
+  const newCollateralAmount = collateralAmount - interestAdaAmt;
   const tx = lucid.newTx().validFrom(txValidity.validFrom).validTo(txValidity.validTo).collectFrom(
     [cdpUtxo],
     serialiseCdpRedeemer({
@@ -1490,7 +1509,7 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
         }
       })
     },
-    addAssets3(cdpUtxo.assets, mkLovelacesOf(collateralAmount))
+    addAssets3(cdpUtxo.assets, mkLovelacesOf(newCollateralAmount))
   );
   if (!cdpDatum.cdpOwner) {
     throw new Error("Expected active CDP");
@@ -1517,18 +1536,6 @@ async function adjustCdp(collateralAmount, mintAmount, cdpOref, iassetOref, pric
       Data14.void()
     );
   }
-  const interestAdaAmt = match7(cdpDatum.cdpFees).with({ FrozenCDPAccumulatedFees: P6.any }, () => {
-    throw new Error("CDP fees wrong");
-  }).with({ ActiveCDPInterestTracking: P6.select() }, (interest) => {
-    const interestPaymentIAssetAmt = calculateAccruedInterest(
-      currentTime,
-      interest.unitaryInterestSnapshot,
-      cdpDatum.mintedAmt,
-      interest.lastSettled,
-      interestOracleDatum
-    );
-    return interestPaymentIAssetAmt * priceOracleDatum.price.getOnChainInt / 1000000n;
-  }).exhaustive();
   const interestCollectorAdaAmt = calculateFeeFromPercentage(
     iassetDatum.interestCollectorPortionPercentage,
     interestAdaAmt
@@ -2508,7 +2515,9 @@ var StakingRedeemerSchema = Data18.Enum([
 ]);
 var StakingRedeemer = StakingRedeemerSchema;
 function serialiseStakingRedeemer(redeemer) {
-  const rdmr = Data18.to(redeemer, StakingRedeemer, { canonical: false });
+  const rdmr = Data18.to(redeemer, StakingRedeemer, {
+    canonical: false
+  });
   return rdmr;
 }
 function castStakingParams(params) {
@@ -2578,7 +2587,9 @@ function serialiseStakingDatum(d) {
     StakingDatumSchema,
     DEFAULT_SCHEMA_OPTIONS
   ).toCBORHex(d);
-  return Data19.to(Data19.from(datum, typeof Data19), typeof Data19, { canonical: false });
+  return Data19.to(Data19.from(datum, typeof Data19), typeof Data19, {
+    canonical: false
+  });
 }
 
 // src/contracts/staking/helpers.ts
@@ -5260,7 +5271,7 @@ function serialiseLrpDatum(datum) {
   return Data28.to(datum, LRPDatum);
 }
 function serialiseLrpRedeemer(redeemer) {
-  return Data28.to(redeemer, LRPRedeemer);
+  return Data28.to(redeemer, LRPRedeemer, { canonical: true });
 }
 function castLrpParams(params) {
   return Data28.castTo(params, LRPParams);

package/package.json

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

package/src/contracts/cdp/transactions.ts

@@ -291,6 +291,28 @@ async function adjustCdp(
     network,
   );
 
+  const interestAdaAmt = match(cdpDatum.cdpFees)
+    .with({ FrozenCDPAccumulatedFees: P.any }, () => {
+      throw new Error('CDP fees wrong');
+    })
+    .with({ ActiveCDPInterestTracking: P.select() }, (interest) => {
+      const interestPaymentIAssetAmt = calculateAccruedInterest(
+        currentTime,
+        interest.unitaryInterestSnapshot,
+        cdpDatum.mintedAmt,
+        interest.lastSettled,
+        interestOracleDatum,
+      );
+
+      return (
+        (interestPaymentIAssetAmt * priceOracleDatum.price.getOnChainInt) /
+        1_000_000n
+      );
+    })
+    .exhaustive();
+
+  const newCollateralAmount = collateralAmount - interestAdaAmt;
+
   const tx = lucid
     .newTx()
     .validFrom(txValidity.validFrom)
@@ -326,7 +348,7 @@ async function adjustCdp(
           },
         }),
       },
-      addAssets(cdpUtxo.assets, mkLovelacesOf(collateralAmount)),
+      addAssets(cdpUtxo.assets, mkLovelacesOf(newCollateralAmount)),
     );
 
   if (!cdpDatum.cdpOwner) {
@@ -359,26 +381,6 @@ async function adjustCdp(
     );
   }
 
-  const interestAdaAmt = match(cdpDatum.cdpFees)
-    .with({ FrozenCDPAccumulatedFees: P.any }, () => {
-      throw new Error('CDP fees wrong');
-    })
-    .with({ ActiveCDPInterestTracking: P.select() }, (interest) => {
-      const interestPaymentIAssetAmt = calculateAccruedInterest(
-        currentTime,
-        interest.unitaryInterestSnapshot,
-        cdpDatum.mintedAmt,
-        interest.lastSettled,
-        interestOracleDatum,
-      );
-
-      return (
-        (interestPaymentIAssetAmt * priceOracleDatum.price.getOnChainInt) /
-        1_000_000n
-      );
-    })
-    .exhaustive();
-
   const interestCollectorAdaAmt = calculateFeeFromPercentage(
     iassetDatum.interestCollectorPortionPercentage,
     interestAdaAmt,

package/src/contracts/cdp-creator/types.ts

@@ -40,7 +40,9 @@ export const CDPCreatorRedeemer =
 export function serialiseCDPCreatorRedeemer(
   params: CDPCreatorRedeemer,
 ): Redeemer {
-  return Data.to<CDPCreatorRedeemer>(params, CDPCreatorRedeemer, { canonical: true });
+  return Data.to<CDPCreatorRedeemer>(params, CDPCreatorRedeemer, {
+    canonical: true,
+  });
 }
 
 export function serialiseCDPCreatorDatum(): Datum {

package/src/contracts/lrp/types.ts

@@ -65,7 +65,7 @@ export function serialiseLrpDatum(datum: LRPDatum): Datum {
 }
 
 export function serialiseLrpRedeemer(redeemer: LRPRedeemer): Redeemer {
-  return Data.to<LRPRedeemer>(redeemer, LRPRedeemer);
+  return Data.to<LRPRedeemer>(redeemer, LRPRedeemer, {canonical: true});
 }
 
 export function castLrpParams(params: LRPParams): Data {

package/src/contracts/stability-pool/types-new.ts

@@ -127,7 +127,9 @@ export function serialiseStabilityPoolRedeemer(
     DEFAULT_SCHEMA_OPTIONS,
   ).toCBORHex(r);
 
-  return Data.to(Data.from(rdmr, typeof Data), typeof Data, {canonical: false});
+  return Data.to(Data.from(rdmr, typeof Data), typeof Data, {
+    canonical: false,
+  });
 }
 
 export function serialiseStabilityPoolDatum(
@@ -142,7 +144,9 @@ export function serialiseStabilityPoolDatum(
     useIndefiniteMaps: useIndefiniteMaps,
   }).toCBORHex(d);
 
-  return Data.to(Data.from(datum, typeof Data), typeof Data, {canonical: false});
+  return Data.to(Data.from(datum, typeof Data), typeof Data, {
+    canonical: false,
+  });
 }
 
 export function parseStabilityPoolDatum(datum: string): StabilityPoolContent {

package/src/contracts/staking/types-new.ts

@@ -80,5 +80,7 @@ export function serialiseStakingDatum(d: StakingDatum): string {
     DEFAULT_SCHEMA_OPTIONS,
   ).toCBORHex(d);
 
-  return Data.to(Data.from(datum, typeof Data), typeof Data, {canonical: false});
+  return Data.to(Data.from(datum, typeof Data), typeof Data, {
+    canonical: false,
+  });
 }

package/src/contracts/staking/types.ts

@@ -33,7 +33,9 @@ export type StakingRedeemer = Data.Static<typeof StakingRedeemerSchema>;
 const StakingRedeemer = StakingRedeemerSchema as unknown as StakingRedeemer;
 
 export function serialiseStakingRedeemer(redeemer: StakingRedeemer): Redeemer {
-  const rdmr = Data.to<StakingRedeemer>(redeemer, StakingRedeemer, {canonical: false});
+  const rdmr = Data.to<StakingRedeemer>(redeemer, StakingRedeemer, {
+    canonical: false,
+  });
   return rdmr;
 }