@haven-fi/solauto-sdk 1.0.64 → 1.0.66

package/dist/transactions/transactionUtils.js

@@ -366,7 +366,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         ]);
     }
     if (client.solautoPositionState.liqUtilizationRateBps >
-        (0, numberUtils_1.getMaxLiqUtilizationRate)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps)) {
+        (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps)) {
         tx = tx.prepend(client.refresh());
     }
     return {

package/dist/utils/marginfiUtils.d.ts

@@ -10,10 +10,10 @@ export declare function findMarginfiAccounts({ mint, bank, }: {
 }): MarginfiAssetAccounts;
 export declare function getMaxLtvAndLiqThreshold(umi: Umi, supply: {
     mint: PublicKey;
-    bank: Bank | null;
+    bank?: Bank | null;
 }, debt: {
     mint: PublicKey;
-    bank: Bank | null;
+    bank?: Bank | null;
 }, supplyPrice?: number): Promise<[number, number]>;
 export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
     marginfiAccount: PublicKey;

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;AAUzB,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,EACnC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACnB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CACnB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8D3B;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,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}
+{"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;AAUzB,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,EACnC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,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,CA8D3B;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,CA6CA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA+IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}

package/dist/utils/marginfiUtils.js

@@ -28,12 +28,12 @@ function findMarginfiAccounts({ mint, bank, }) {
     throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
 }
 async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
-    if (!supply.bank) {
+    if (!supply.bank || supply.bank === null) {
         supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
             mint: supply.mint.toString(),
         }).bank));
     }
-    if (!debt.bank && !debt.mint.equals(web3_js_1.PublicKey.default)) {
+    if ((!debt.bank || debt.bank === null) && !debt.mint.equals(web3_js_1.PublicKey.default)) {
         debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({
             mint: debt.mint.toString(),
         }).bank));
@@ -44,7 +44,7 @@ async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
         ]);
         supplyPrice = price;
     }
-    if (debt.bank === null) {
+    if (!debt.bank || debt.bank === null) {
         return [0, 0];
     }
     let maxLtv = (0, numberUtils_1.bytesToI80F48)(supply.bank.config.assetWeightInit.value) /

package/dist/utils/numberUtils.d.ts

@@ -6,7 +6,7 @@ export declare function toBps(value: number): number;
 export declare function bytesToI80F48(bytes: number[]): number;
 export declare function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint;
 export declare function getDebtAdjustmentUsd(liqThresholdBps: number, supplyUsd: number, debtUsd: number, targetLiqUtilizationRateBps: number, adjustmentFeeBps?: number): number;
-export declare function getMaxLiqUtilizationRate(maxLtvBps: number, liqThresholdBps: number): number;
-export declare function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number): number;
-export declare function maxRepayTo(maxLtvBps: number, liqThresholdBps: number): number;
+export declare function getMaxLiqUtilizationRateBps(maxLtvBps: number, liqThresholdBps: number): number;
+export declare function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number): number;
+export declare function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number): number;
 //# sourceMappingURL=numberUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B;AAED,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKtE;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKpE"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}

package/dist/utils/numberUtils.js

@@ -8,9 +8,9 @@ exports.toBps = toBps;
 exports.bytesToI80F48 = bytesToI80F48;
 exports.uint8ArrayToBigInt = uint8ArrayToBigInt;
 exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
-exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
-exports.maxRepayFrom = maxRepayFrom;
-exports.maxRepayTo = maxRepayTo;
+exports.getMaxLiqUtilizationRateBps = getMaxLiqUtilizationRateBps;
+exports.maxRepayFromBps = maxRepayFromBps;
+exports.maxRepayToBps = maxRepayToBps;
 const constants_1 = require("../constants");
 function getLiqUtilzationRateBps(supplyUsd, debtUsd, liqThresholdBps) {
     if (supplyUsd === 0) {
@@ -63,12 +63,12 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
     const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) / (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
     return debtAdjustmentUsd;
 }
-function getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps) {
+function getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps) {
     return toBps((fromBps(maxLtvBps) - 0.015) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
-function maxRepayFrom(maxLtvBps, liqThresholdBps) {
-    return Math.min(9000, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000));
+function maxRepayFromBps(maxLtvBps, liqThresholdBps) {
+    return Math.min(9000, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000));
 }
-function maxRepayTo(maxLtvBps, liqThresholdBps) {
-    return Math.min(maxRepayFrom(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps));
+function maxRepayToBps(maxLtvBps, liqThresholdBps) {
+    return Math.min(maxRepayFromBps(maxLtvBps, liqThresholdBps) - constants_1.MAX_REPAY_GAP_BPS, getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps));
 }

package/dist/utils/solauto/rebalanceUtils.js

@@ -134,7 +134,7 @@ function getFlashLoanDetails(client, values, jupQuote) {
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
     const requiresFlashLoan = supplyUsd <= 0 ||
         tempLiqUtilizationRateBps >
-            (0, numberUtils_1.getMaxLiqUtilizationRate)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps);
+            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     if (values.increasingLeverage) {

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -45,7 +45,7 @@ import {
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
 import {
-  getMaxLiqUtilizationRate,
+  getMaxLiqUtilizationRateBps,
   uint8ArrayToBigInt,
 } from "../utils/numberUtils";
 import { eligibleForRebalance } from "../utils/solauto/generalUtils";
@@ -670,7 +670,7 @@ export async function buildSolautoRebalanceTransaction(
 
   if (
     client.solautoPositionState!.liqUtilizationRateBps >
-    getMaxLiqUtilizationRate(
+    getMaxLiqUtilizationRateBps(
       client.solautoPositionState!.maxLtvBps,
       client.solautoPositionState!.liqThresholdBps
     )

package/src/utils/marginfiUtils.ts

@@ -46,15 +46,15 @@ export async function getMaxLtvAndLiqThreshold(
   umi: Umi,
   supply: {
     mint: PublicKey;
-    bank: Bank | null;
+    bank?: Bank | null;
   },
   debt: {
     mint: PublicKey;
-    bank: Bank | null;
+    bank?: Bank | null;
   },
   supplyPrice?: number
 ): Promise<[number, number]> {
-  if (!supply.bank) {
+  if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
       publicKey(
@@ -65,7 +65,7 @@ export async function getMaxLtvAndLiqThreshold(
     );
   }
 
-  if (!debt.bank && !debt.mint.equals(PublicKey.default)) {
+  if ((!debt.bank || debt.bank === null) && !debt.mint.equals(PublicKey.default)) {
     debt.bank = await safeFetchBank(
       umi,
       publicKey(
@@ -83,7 +83,7 @@ export async function getMaxLtvAndLiqThreshold(
     supplyPrice = price;
   }
 
-  if (debt.bank === null) {
+  if (!debt.bank || debt.bank === null) {
     return [0, 0];
   }
 

package/src/utils/numberUtils.ts

@@ -77,23 +77,23 @@ export function getDebtAdjustmentUsd(
   return debtAdjustmentUsd;
 }
 
-export function getMaxLiqUtilizationRate(
+export function getMaxLiqUtilizationRateBps(
   maxLtvBps: number,
   liqThresholdBps: number
 ): number {
   return toBps((fromBps(maxLtvBps) - 0.015) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
 
-export function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number) {
+export function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number) {
   return Math.min(
     9000,
-    getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps - 1000)
+    getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps - 1000)
   );
 }
 
-export function maxRepayTo(maxLtvBps: number, liqThresholdBps: number) {
+export function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number) {
   return Math.min(
-    maxRepayFrom(maxLtvBps, liqThresholdBps) - MAX_REPAY_GAP_BPS,
-    getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps)
+    maxRepayFromBps(maxLtvBps, liqThresholdBps) - MAX_REPAY_GAP_BPS,
+    getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps)
   );
 }

package/src/utils/solauto/rebalanceUtils.ts

@@ -22,7 +22,7 @@ import {
   fromBps,
   getDebtAdjustmentUsd,
   getLiqUtilzationRateBps,
-  getMaxLiqUtilizationRate,
+  getMaxLiqUtilizationRateBps,
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
@@ -289,7 +289,7 @@ export function getFlashLoanDetails(
   const requiresFlashLoan =
     supplyUsd <= 0 ||
     tempLiqUtilizationRateBps >
-      getMaxLiqUtilizationRate(
+      getMaxLiqUtilizationRateBps(
         client.solautoPositionState!.maxLtvBps,
         client.solautoPositionState!.liqThresholdBps
       );

package/tests/transactions/solautoMarginfi.ts

@@ -10,7 +10,7 @@ import {
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import { getMaxLiqUtilizationRate, toBaseUnit } from "../../src/utils/numberUtils";
+import { getMaxLiqUtilizationRateBps, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -82,7 +82,7 @@ describe("Solauto Marginfi tests", async () => {
     //   );
     // }
 
-    // const maxLiqRate = getMaxLiqUtilizationRate(client.solautoPositionState!.maxLtvBps, client.solautoPositionState!.liqThresholdBps);
+    // const maxLiqRate = getMaxLiqUtilizationRateBps(client.solautoPositionState!.maxLtvBps, client.solautoPositionState!.liqThresholdBps);
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({