@haven-fi/solauto-sdk 1.0.305 → 1.0.307

package/dist/utils/marginfiUtils.d.ts

@@ -21,6 +21,7 @@ export declare function getAllMarginfiAccountsByAuthority(conn: Connection, umi:
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
 }[]>;
+export declare function getBankLiquidityBaseUnit(bank: Bank | null, isAsset: boolean): number;
 interface BankSelection {
     mint?: PublicKey;
     banksCache?: BanksCache;
@@ -35,6 +36,6 @@ export declare function getMarginfiAccountPositionState(umi: Umi, protocolAccoun
     data?: MarginfiAccount;
 }, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
 export declare function calculateAnnualAPYs(bank: Bank): [number, number];
-export declare function getUpToDateShareValues(bank: Bank): Promise<[number, number]>;
+export declare function getUpToDateShareValues(bank: Bank): [number, number];
 export {};
 //# sourceMappingURL=marginfiUtils.d.ts.map

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,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAazB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,yBAAyB,CACvC,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,IAAI,EAAE,UAAU,EAChB,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,CAuDA;AA+DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAiLpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAazB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,yBAAyB,CACvC,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,IAAI,EAAE,UAAU,EAChB,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,CAuDA;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,OAAO,EAAE,OAAO,UAejB;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAiLpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}

package/dist/utils/marginfiUtils.js

@@ -4,6 +4,7 @@ exports.findMarginfiAccounts = findMarginfiAccounts;
 exports.calcMaxLtvAndLiqThreshold = calcMaxLtvAndLiqThreshold;
 exports.getMaxLtvAndLiqThreshold = getMaxLtvAndLiqThreshold;
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
+exports.getBankLiquidityBaseUnit = getBankLiquidityBaseUnit;
 exports.getMarginfiAccountPositionState = getMarginfiAccountPositionState;
 exports.calculateAnnualAPYs = calculateAnnualAPYs;
 exports.getUpToDateShareValues = getUpToDateShareValues;
@@ -107,23 +108,29 @@ async function getAllMarginfiAccountsByAuthority(conn, umi, authority, compatibl
         }));
     }
 }
-async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
-    let amountUsed = 0;
+function getBankLiquidityBaseUnit(bank, isAsset) {
     let amountCanBeUsed = 0;
-    let marketPrice = 0;
     if (bank !== null) {
-        [marketPrice] = await (0, priceUtils_1.fetchTokenPrices)([
-            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint),
-        ]);
-        const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(bank);
-        const shareValue = isAsset ? assetShareValue : liabilityShareValue;
-        amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
+        const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
         const totalDeposited = (0, numberUtils_1.bytesToI80F48)(bank.totalAssetShares.value) * assetShareValue;
         amountCanBeUsed = isAsset
             ? Number(bank.config.depositLimit) - totalDeposited
             : totalDeposited -
                 (0, numberUtils_1.bytesToI80F48)(bank.totalLiabilityShares.value) * liabilityShareValue;
     }
+    return amountCanBeUsed;
+}
+async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
+    let amountUsed = 0;
+    let amountCanBeUsed = 0;
+    let marketPrice = 0;
+    if (bank !== null) {
+        [marketPrice] = await (0, priceUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
+        const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
+        const shareValue = isAsset ? assetShareValue : liabilityShareValue;
+        amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
+        amountCanBeUsed = getBankLiquidityBaseUnit(bank, isAsset);
+    }
     return {
         mint: bank?.mint ?? (0, umi_1.publicKey)(web3_js_1.PublicKey.default),
         decimals: bank?.mintDecimals ?? 0,
@@ -281,7 +288,7 @@ function calculateAnnualAPYs(bank) {
     const utilizationRatio = totalLiabilities / totalAssets;
     return calcInterestRate(bank, utilizationRatio);
 }
-async function getUpToDateShareValues(bank) {
+function getUpToDateShareValues(bank) {
     let timeDelta = (0, generalUtils_1.currentUnixSeconds)() - Number(bank.lastUpdate);
     const [lendingApr, borrowingApr] = calculateAnnualAPYs(bank);
     return [

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

@@ -18,6 +18,7 @@ interface AssetProps {
     mint: PublicKey;
     price?: number;
     amountUsed?: number;
+    amountCanBeUsed?: number;
 }
 export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
 export declare function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters;

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

@@ -304,8 +304,8 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
                 baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(supplyUsd, constants_1.USD_DECIMALS),
             },
             amountCanBeUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, supplyDecimals),
-                baseAmountUsdValue: BigInt(Math.round(1000000 * (supply.price ?? 0))),
+                baseUnit: (0, numberUtils_1.toBaseUnit)(supply.amountCanBeUsed ?? 0, supplyDecimals),
+                baseAmountUsdValue: BigInt(Math.round((supply.amountUsed ?? 0) * (supply.price ?? 0))),
             },
             baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(supply.price ?? 0, constants_1.USD_DECIMALS),
             borrowFeeBps: 0,
@@ -322,8 +322,8 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
                 baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)(debtUsd, constants_1.USD_DECIMALS),
             },
             amountCanBeUsed: {
-                baseUnit: (0, numberUtils_1.toBaseUnit)(1000000, debtDecimals),
-                baseAmountUsdValue: BigInt(Math.round(1000000 * (debt.price ?? 0))),
+                baseUnit: (0, numberUtils_1.toBaseUnit)(debt.amountCanBeUsed ?? 0, debtDecimals),
+                baseAmountUsdValue: BigInt(Math.round((debt.amountCanBeUsed ?? 0) * (debt.price ?? 0))),
             },
             baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(debt.price ?? 0, constants_1.USD_DECIMALS),
             borrowFeeBps: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.305",
+  "version": "1.0.307",
   "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

@@ -201,6 +201,25 @@ export async function getAllMarginfiAccountsByAuthority(
   }
 }
 
+export function getBankLiquidityBaseUnit(
+  bank: Bank | null,
+  isAsset: boolean
+) {
+  let amountCanBeUsed = 0;
+
+  if (bank !== null) {
+    const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
+    const totalDeposited =
+      bytesToI80F48(bank.totalAssetShares.value) * assetShareValue;
+    amountCanBeUsed = isAsset
+      ? Number(bank.config.depositLimit) - totalDeposited
+      : totalDeposited -
+        bytesToI80F48(bank.totalLiabilityShares.value) * liabilityShareValue;
+  }
+
+  return amountCanBeUsed;
+}
+
 async function getTokenUsage(
   bank: Bank | null,
   isAsset: boolean,
@@ -212,20 +231,11 @@ async function getTokenUsage(
   let marketPrice = 0;
 
   if (bank !== null) {
-    [marketPrice] = await fetchTokenPrices([
-      toWeb3JsPublicKey(bank.mint),
-    ]);
-    const [assetShareValue, liabilityShareValue] =
-      await getUpToDateShareValues(bank);
+    [marketPrice] = await fetchTokenPrices([toWeb3JsPublicKey(bank.mint)]);
+    const [assetShareValue, liabilityShareValue] = getUpToDateShareValues(bank);
     const shareValue = isAsset ? assetShareValue : liabilityShareValue;
     amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
-
-    const totalDeposited =
-      bytesToI80F48(bank.totalAssetShares.value) * assetShareValue;
-    amountCanBeUsed = isAsset
-      ? Number(bank.config.depositLimit) - totalDeposited
-      : totalDeposited -
-        bytesToI80F48(bank.totalLiabilityShares.value) * liabilityShareValue;
+    amountCanBeUsed = getBankLiquidityBaseUnit(bank, isAsset);
   }
 
   return {
@@ -528,9 +538,7 @@ export function calculateAnnualAPYs(bank: Bank) {
   return calcInterestRate(bank, utilizationRatio);
 }
 
-export async function getUpToDateShareValues(
-  bank: Bank
-): Promise<[number, number]> {
+export function getUpToDateShareValues(bank: Bank): [number, number] {
   let timeDelta = currentUnixSeconds() - Number(bank.lastUpdate);
   const [lendingApr, borrowingApr] = calculateAnnualAPYs(bank);
 

package/src/utils/solauto/generalUtils.ts

@@ -450,6 +450,7 @@ interface AssetProps {
   mint: PublicKey;
   price?: number;
   amountUsed?: number;
+  amountCanBeUsed?: number;
 }
 
 export function createFakePositionState(
@@ -476,8 +477,10 @@ export function createFakePositionState(
         baseAmountUsdValue: toBaseUnit(supplyUsd, USD_DECIMALS),
       },
       amountCanBeUsed: {
-        baseUnit: toBaseUnit(1000000, supplyDecimals),
-        baseAmountUsdValue: BigInt(Math.round(1000000 * (supply.price ?? 0))),
+        baseUnit: toBaseUnit(supply.amountCanBeUsed ?? 0, supplyDecimals),
+        baseAmountUsdValue: BigInt(
+          Math.round((supply.amountUsed ?? 0) * (supply.price ?? 0))
+        ),
       },
       baseAmountMarketPriceUsd: toBaseUnit(supply.price ?? 0, USD_DECIMALS),
       borrowFeeBps: 0,
@@ -494,8 +497,10 @@ export function createFakePositionState(
         baseAmountUsdValue: toBaseUnit(debtUsd, USD_DECIMALS),
       },
       amountCanBeUsed: {
-        baseUnit: toBaseUnit(1000000, debtDecimals),
-        baseAmountUsdValue: BigInt(Math.round(1000000 * (debt.price ?? 0))),
+        baseUnit: toBaseUnit(debt.amountCanBeUsed ?? 0, debtDecimals),
+        baseAmountUsdValue: BigInt(
+          Math.round((debt.amountCanBeUsed ?? 0) * (debt.price ?? 0))
+        ),
       },
       baseAmountMarketPriceUsd: toBaseUnit(debt.price ?? 0, USD_DECIMALS),
       borrowFeeBps: 0,

package/tests/transactions/solautoMarginfi.ts

@@ -3,6 +3,7 @@ import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
+  safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
@@ -26,7 +27,7 @@ import {
   SOLAUTO_TEST_PROGRAM,
   USDC,
 } from "../../src/constants";
-import { buildHeliusApiUrl } from "../../src/utils";
+import { buildHeliusApiUrl, getSolautoManagedPositions, positionStateWithLatestPrices } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
 
 describe("Solauto Marginfi tests", async () => {
@@ -40,8 +41,8 @@ describe("Solauto Marginfi tests", async () => {
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
       buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
-      true,
-      testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
+      true
+      // testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
     );
 
     const supply = NATIVE_MINT;
@@ -155,13 +156,13 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    const statuses = await new TransactionsManager(
-      client,
-      undefined,
-      !payForTransactions ? "only-simulate" : "normal",
-      PriorityFeeSetting.Low
-    ).clientSend(transactionItems);
+    // const statuses = await new TransactionsManager(
+    //   client,
+    //   undefined,
+    //   !payForTransactions ? "only-simulate" : "normal",
+    //   PriorityFeeSetting.Low
+    // ).clientSend(transactionItems);
 
-    console.log(statuses);
+    // console.log(statuses);
   });
 });