@haven-fi/solauto-sdk 1.0.200 → 1.0.201

package/dist/utils/marginfiUtils.d.ts

@@ -5,6 +5,7 @@ import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 export declare function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts;
+export declare function marginfiMaxLtvAndLiqThresholdBps(supplyBank: Bank, debtBank: Bank, supplyPrice: number): [number, number];
 export declare function getMaxLtvAndLiqThreshold(umi: Umi, marginfiGroup: PublicKey, supply: {
     mint: PublicKey;
     bank?: Bank | null;

package/dist/utils/marginfiUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAuKpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAmLpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}

package/dist/utils/marginfiUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findMarginfiAccounts = findMarginfiAccounts;
+exports.marginfiMaxLtvAndLiqThresholdBps = marginfiMaxLtvAndLiqThresholdBps;
 exports.getMaxLtvAndLiqThreshold = getMaxLtvAndLiqThreshold;
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
 exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
@@ -25,6 +26,21 @@ function findMarginfiAccounts(bank) {
     }
     throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
+function marginfiMaxLtvAndLiqThresholdBps(supplyBank, debtBank, supplyPrice) {
+    let maxLtv = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightInit.value) /
+        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightInit.value);
+    const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightMaint.value) /
+        (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightMaint.value);
+    const totalDepositedUsdValue = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round((0, numberUtils_1.bytesToI80F48)(supplyBank.totalAssetShares.value) *
+        (0, numberUtils_1.bytesToI80F48)(supplyBank.assetShareValue.value))), supplyBank.mintDecimals) * supplyPrice;
+    if (supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
+        totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit) {
+        const discount = Number(supplyBank.config.totalAssetValueInitLimit) /
+            totalDepositedUsdValue;
+        maxLtv = Math.round(maxLtv * Number(discount));
+    }
+    return [maxLtv, liqThreshold];
+}
 async function getMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt, supplyPrice) {
     if (!supply.bank && supply.mint.equals(web3_js_1.PublicKey.default)) {
         return [0, 0];
@@ -45,19 +61,7 @@ async function getMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt, supply
     if (!debt.bank || debt.bank === null) {
         return [0, 0];
     }
-    let maxLtv = (0, numberUtils_1.bytesToI80F48)(supply.bank.config.assetWeightInit.value) /
-        (0, numberUtils_1.bytesToI80F48)(debt.bank.config.liabilityWeightInit.value);
-    const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supply.bank.config.assetWeightMaint.value) /
-        (0, numberUtils_1.bytesToI80F48)(debt.bank.config.liabilityWeightMaint.value);
-    const totalDepositedUsdValue = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round((0, numberUtils_1.bytesToI80F48)(supply.bank.totalAssetShares.value) *
-        (0, numberUtils_1.bytesToI80F48)(supply.bank.assetShareValue.value))), supply.bank.mintDecimals) * supplyPrice;
-    if (supply.bank.config.totalAssetValueInitLimit !== BigInt(0) &&
-        totalDepositedUsdValue > supply.bank.config.totalAssetValueInitLimit) {
-        const discount = Number(supply.bank.config.totalAssetValueInitLimit) /
-            totalDepositedUsdValue;
-        maxLtv = Math.round(maxLtv * Number(discount));
-    }
-    return [maxLtv, liqThreshold];
+    return marginfiMaxLtvAndLiqThresholdBps(supply.bank, debt.bank, supplyPrice);
 }
 async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithSolauto) {
     const marginfiAccounts = await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {

package/package.json

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

package/src/utils/marginfiUtils.ts

@@ -20,7 +20,10 @@ import {
   toBaseUnit,
   toBps,
 } from "./numberUtils";
-import { DEFAULT_MARGINFI_GROUP, MARGINFI_ACCOUNTS } from "../constants/marginfiAccounts";
+import {
+  DEFAULT_MARGINFI_GROUP,
+  MARGINFI_ACCOUNTS,
+} from "../constants/marginfiAccounts";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState, PositionTokenUsage } from "../generated";
 import { USD_DECIMALS } from "../constants/generalAccounts";
@@ -41,6 +44,41 @@ export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
   throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 
+export function marginfiMaxLtvAndLiqThresholdBps(
+  supplyBank: Bank,
+  debtBank: Bank,
+  supplyPrice: number
+): [number, number] {
+  let maxLtv =
+    bytesToI80F48(supplyBank.config.assetWeightInit.value) /
+    bytesToI80F48(debtBank.config.liabilityWeightInit.value);
+  const liqThreshold =
+    bytesToI80F48(supplyBank.config.assetWeightMaint.value) /
+    bytesToI80F48(debtBank.config.liabilityWeightMaint.value);
+
+  const totalDepositedUsdValue =
+    fromBaseUnit(
+      BigInt(
+        Math.round(
+          bytesToI80F48(supplyBank.totalAssetShares.value) *
+            bytesToI80F48(supplyBank.assetShareValue.value)
+        )
+      ),
+      supplyBank.mintDecimals
+    ) * supplyPrice!;
+  if (
+    supplyBank.config.totalAssetValueInitLimit !== BigInt(0) &&
+    totalDepositedUsdValue > supplyBank.config.totalAssetValueInitLimit
+  ) {
+    const discount =
+      Number(supplyBank.config.totalAssetValueInitLimit) /
+      totalDepositedUsdValue;
+    maxLtv = Math.round(maxLtv * Number(discount));
+  }
+
+  return [maxLtv, liqThreshold];
+}
+
 export async function getMaxLtvAndLiqThreshold(
   umi: Umi,
   marginfiGroup: PublicKey,
@@ -61,7 +99,9 @@ export async function getMaxLtvAndLiqThreshold(
   if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
-      publicKey(MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank),
+      publicKey(
+        MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank
+      ),
       { commitment: "confirmed" }
     );
   }
@@ -72,7 +112,9 @@ export async function getMaxLtvAndLiqThreshold(
   ) {
     debt.bank = await safeFetchBank(
       umi,
-      publicKey(MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank),
+      publicKey(
+        MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank
+      ),
       { commitment: "confirmed" }
     );
   }
@@ -88,34 +130,7 @@ export async function getMaxLtvAndLiqThreshold(
     return [0, 0];
   }
 
-  let maxLtv =
-    bytesToI80F48(supply.bank!.config.assetWeightInit.value) /
-    bytesToI80F48(debt.bank.config.liabilityWeightInit.value);
-  const liqThreshold =
-    bytesToI80F48(supply.bank!.config.assetWeightMaint.value) /
-    bytesToI80F48(debt.bank.config.liabilityWeightMaint.value);
-
-  const totalDepositedUsdValue =
-    fromBaseUnit(
-      BigInt(
-        Math.round(
-          bytesToI80F48(supply.bank!.totalAssetShares.value) *
-            bytesToI80F48(supply.bank!.assetShareValue.value)
-        )
-      ),
-      supply.bank!.mintDecimals
-    ) * supplyPrice!;
-  if (
-    supply.bank!.config.totalAssetValueInitLimit !== BigInt(0) &&
-    totalDepositedUsdValue > supply.bank!.config.totalAssetValueInitLimit
-  ) {
-    const discount =
-      Number(supply.bank!.config.totalAssetValueInitLimit) /
-      totalDepositedUsdValue;
-    maxLtv = Math.round(maxLtv * Number(discount));
-  }
-
-  return [maxLtv, liqThreshold];
+  return marginfiMaxLtvAndLiqThresholdBps(supply.bank!, debt.bank, supplyPrice);
 }
 
 export async function getAllMarginfiAccountsByAuthority(
@@ -266,7 +281,11 @@ export async function getMarginfiAccountPositionState(
     supplyMint && supplyMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][supplyMint.toString()].bank),
+          publicKey(
+            MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
+              supplyMint.toString()
+            ].bank
+          ),
           { commitment: "confirmed" }
         )
       : null;
@@ -274,7 +293,11 @@ export async function getMarginfiAccountPositionState(
     debtMint && debtMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][debtMint.toString()].bank),
+          publicKey(
+            MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
+              debtMint.toString()
+            ].bank
+          ),
           { commitment: "confirmed" }
         )
       : null;
@@ -341,7 +364,11 @@ export async function getMarginfiAccountPositionState(
     return undefined;
   }
 
-  if (!toWeb3JsPublicKey(supplyBank.group).equals(new PublicKey(DEFAULT_MARGINFI_GROUP))) {
+  if (
+    !toWeb3JsPublicKey(supplyBank.group).equals(
+      new PublicKey(DEFAULT_MARGINFI_GROUP)
+    )
+  ) {
     // Temporarily disabled for now
     return undefined;
   }