@haven-fi/solauto-sdk 1.0.63 → 1.0.64

package/dist/utils/solauto/generalUtils.d.ts

@@ -19,10 +19,9 @@ export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<P
 export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey): Promise<SolautoPositionDetails[]>;
 export declare function positionStateWithLatestPrices(state: PositionState, supplyPrice?: number, debtPrice?: number): Promise<PositionState>;
 interface AssetProps {
-    amountUsedBaseUnit: bigint;
-    decimals: number;
-    price: number;
     mint: PublicKey;
+    price: number;
+    amountUsed: number;
 }
 export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
 type PositionAdjustment = {

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/generalUtils.js

@@ -248,22 +248,24 @@ async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     };
 }
 function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
-    const supplyUsd = (0, numberUtils_1.fromBaseUnit)(supply.amountUsedBaseUnit, supply.decimals) * supply.price;
-    const debtUsd = (0, numberUtils_1.fromBaseUnit)(debt.amountUsedBaseUnit, debt.decimals) * debt.price;
+    const supplyDecimals = constants_1.TOKEN_DECIMALS[supply.mint.toString()];
+    const debtDecimals = constants_1.TOKEN_DECIMALS[debt.mint.toString()];
+    const supplyUsd = supply.amountUsed * supply.price;
+    const debtUsd = debt.amountUsed * debt.price;
     return {
         liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, liqThresholdBps),
         supply: {
             amountUsed: {
-                baseUnit: supply.amountUsedBaseUnit,
+                baseUnit: (0, numberUtils_1.toBaseUnit)(supply.amountUsed, supplyDecimals),
                 baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, constants_1.USD_DECIMALS),
             },
             amountCanBeUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, supply.decimals),
+                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, supplyDecimals),
                 baseAmountUsdValue: BigInt(Math.round(1000000 * supply.price)),
             },
             baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(supply.price, constants_1.USD_DECIMALS),
             borrowFeeBps: 0,
-            decimals: supply.decimals,
+            decimals: supplyDecimals,
             flashLoanFeeBps: 0,
             mint: (0, umi_1.publicKey)(supply.mint),
             padding1: [],
@@ -272,16 +274,16 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
         },
         debt: {
             amountUsed: {
-                baseUnit: debt.amountUsedBaseUnit,
+                baseUnit: (0, numberUtils_1.toBaseUnit)(debt.amountUsed, debtDecimals),
                 baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, constants_1.USD_DECIMALS),
             },
             amountCanBeUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, debt.decimals),
+                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, debtDecimals),
                 baseAmountUsdValue: BigInt(Math.round(1000000 * debt.price)),
             },
             baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(debt.price, constants_1.USD_DECIMALS),
             borrowFeeBps: 0,
-            decimals: debt.decimals,
+            decimals: debtDecimals,
             flashLoanFeeBps: 0,
             mint: (0, umi_1.publicKey)(debt.mint),
             padding1: [],
@@ -289,7 +291,7 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
             padding: new Uint8Array([]),
         },
         netWorth: {
-            baseUnit: (0, numberUtils_1.toBaseUnit)((supplyUsd - debtUsd) / supply.price, supply.decimals),
+            baseUnit: (0, numberUtils_1.toBaseUnit)((supplyUsd - debtUsd) / supply.price, supplyDecimals),
             baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd - debtUsd, constants_1.USD_DECIMALS),
         },
         maxLtvBps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.63",
+  "version": "1.0.64",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/utils/solauto/generalUtils.ts

@@ -22,7 +22,11 @@ import {
 } from "../numberUtils";
 import { getReferralState } from "../accountUtils";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { ALL_SUPPORTED_TOKENS, USD_DECIMALS } from "../../constants";
+import {
+  ALL_SUPPORTED_TOKENS,
+  TOKEN_DECIMALS,
+  USD_DECIMALS,
+} from "../../constants";
 import {
   getAllMarginfiAccountsByAuthority,
   getMarginfiAccountPositionState,
@@ -329,7 +333,7 @@ export async function getAllPositionsByAuthority(
 export async function positionStateWithLatestPrices(
   state: PositionState,
   supplyPrice?: number,
-  debtPrice?: number,
+  debtPrice?: number
 ): Promise<PositionState> {
   if (!supplyPrice || !debtPrice) {
     [supplyPrice, debtPrice] = await getTokenPrices([
@@ -376,10 +380,9 @@ export async function positionStateWithLatestPrices(
 }
 
 interface AssetProps {
-  amountUsedBaseUnit: bigint;
-  decimals: number;
-  price: number;
   mint: PublicKey;
+  price: number;
+  amountUsed: number;
 }
 
 export function createFakePositionState(
@@ -388,10 +391,11 @@ export function createFakePositionState(
   maxLtvBps: number,
   liqThresholdBps: number
 ): PositionState {
-  const supplyUsd =
-    fromBaseUnit(supply.amountUsedBaseUnit, supply.decimals) * supply.price;
-  const debtUsd =
-    fromBaseUnit(debt.amountUsedBaseUnit, debt.decimals) * debt.price;
+  const supplyDecimals = TOKEN_DECIMALS[supply.mint.toString()];
+  const debtDecimals = TOKEN_DECIMALS[debt.mint.toString()];
+
+  const supplyUsd = supply.amountUsed * supply.price;
+  const debtUsd = debt.amountUsed * debt.price;
 
   return {
     liqUtilizationRateBps: getLiqUtilzationRateBps(
@@ -401,16 +405,16 @@ export function createFakePositionState(
     ),
     supply: {
       amountUsed: {
-        baseUnit: supply.amountUsedBaseUnit,
+        baseUnit: toBaseUnit(supply.amountUsed, supplyDecimals),
         baseAmountUsdValue: toBaseUnit(supplyUsd, USD_DECIMALS),
       },
       amountCanBeUsed: {
-        baseUnit: toBaseUnit(1000000, supply.decimals),
+        baseUnit: toBaseUnit(1000000, supplyDecimals),
         baseAmountUsdValue: BigInt(Math.round(1000000 * supply.price)),
       },
       baseAmountMarketPriceUsd: toBaseUnit(supply.price, USD_DECIMALS),
       borrowFeeBps: 0,
-      decimals: supply.decimals,
+      decimals: supplyDecimals,
       flashLoanFeeBps: 0,
       mint: publicKey(supply.mint),
       padding1: [],
@@ -419,16 +423,16 @@ export function createFakePositionState(
     },
     debt: {
       amountUsed: {
-        baseUnit: debt.amountUsedBaseUnit,
+        baseUnit: toBaseUnit(debt.amountUsed, debtDecimals),
         baseAmountUsdValue: toBaseUnit(debtUsd, USD_DECIMALS),
       },
       amountCanBeUsed: {
-        baseUnit: toBaseUnit(1000000, debt.decimals),
+        baseUnit: toBaseUnit(1000000, debtDecimals),
         baseAmountUsdValue: BigInt(Math.round(1000000 * debt.price)),
       },
       baseAmountMarketPriceUsd: toBaseUnit(debt.price, USD_DECIMALS),
       borrowFeeBps: 0,
-      decimals: debt.decimals,
+      decimals: debtDecimals,
       flashLoanFeeBps: 0,
       mint: publicKey(debt.mint),
       padding1: [],
@@ -438,7 +442,7 @@ export function createFakePositionState(
     netWorth: {
       baseUnit: toBaseUnit(
         (supplyUsd - debtUsd) / supply.price,
-        supply.decimals
+        supplyDecimals
       ),
       baseAmountUsdValue: toBaseUnit(supplyUsd - debtUsd, USD_DECIMALS),
     },

package/tests/unit/rebalanceCalculations.ts

@@ -120,20 +120,16 @@ async function getFakePosition(
   client.solautoPositionState = await positionStateWithLatestPrices(
     createFakePositionState(
       {
-        amountUsedBaseUnit: toBaseUnit(supplyUsd / supplyPrice, 9),
-        decimals: 9,
+        amountUsed: supplyUsd / supplyPrice,
         price: PRICES[NATIVE_MINT.toString()].price,
         mint: NATIVE_MINT,
       },
       {
-        amountUsedBaseUnit: toBaseUnit(
+        amountUsed:
           (supplyUsd *
             fromBps(liqThresholdBps) *
             fromBps(fakeLiqUtilizationRateBps)) /
-            debtPrice,
-          6
-        ),
-        decimals: 6,
+          debtPrice,
         price: 1,
         mint: new PublicKey(USDC_MINT),
       },