@haven-fi/solauto-sdk 1.0.65 → 1.0.67

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/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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,OAAO,EACP,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAsEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAkE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,OAAO,EACP,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAiJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAsEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAkE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -19,21 +19,20 @@ function getAdditionalAmountToDcaIn(dca) {
 }
 function getStandardTargetLiqUtilizationRateBps(state, settings) {
     const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, (0, generalUtils_2.currentUnixSeconds)());
-    const repayFrom = adjustedSettings.repayToBps - adjustedSettings.repayGap;
-    const boostFrom = adjustedSettings.boostToBps + adjustedSettings.boostGap;
+    const repayFrom = adjustedSettings.repayToBps + adjustedSettings.repayGap;
+    const boostFrom = adjustedSettings.boostToBps - adjustedSettings.boostGap;
     if (state.liqUtilizationRateBps < boostFrom) {
         return adjustedSettings.boostToBps;
     }
-    else if (state.liqUtilizationRateBps > repayFrom ||
-        repayFrom - state.liqUtilizationRateBps < repayFrom * 0.015) {
+    else if (state.liqUtilizationRateBps > repayFrom) {
         return adjustedSettings.repayToBps;
     }
     else {
         throw new Error("Invalid rebalance condition");
     }
 }
-function targetLiqUtilizationRateBpsFromDCA(state, settings, dca) {
-    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, (0, generalUtils_2.currentUnixSeconds)());
+function targetLiqUtilizationRateBpsFromDCA(state, settings, dca, currentUnixTime) {
+    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, currentUnixTime);
     let targetRateBps = 0;
     if (dca.debtToAddBaseUnit > BigInt(0)) {
         targetRateBps = Math.max(state.liqUtilizationRateBps, adjustedSettings.boostToBps);
@@ -47,7 +46,7 @@ function isDcaRebalance(state, settings, dca, currentUnixTime) {
     if (dca === undefined || dca.automation.targetPeriods === 0) {
         return false;
     }
-    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, (0, generalUtils_2.currentUnixSeconds)());
+    const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, currentUnixTime);
     if (state.liqUtilizationRateBps >
         adjustedSettings.repayToBps + adjustedSettings.repayGap) {
         return false;
@@ -68,7 +67,7 @@ function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, target
     }
     if (isDcaRebalance(state, settings, dca, currentUnixTime)) {
         const amountToDcaIn = getAdditionalAmountToDcaIn(dca);
-        const targetLiqUtilizationRateBps = targetLiqUtilizationRateBpsFromDCA(state, settings, dca);
+        const targetLiqUtilizationRateBps = targetLiqUtilizationRateBpsFromDCA(state, settings, dca, currentUnixTime);
         return {
             targetRateBps: targetLiqUtilizationRateBps,
             amountToDcaIn,
@@ -134,7 +133,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.65",
+  "version": "1.0.67",
   "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/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";
@@ -57,15 +57,12 @@ function getStandardTargetLiqUtilizationRateBps(
     currentUnixSeconds()
   );
 
-  const repayFrom = adjustedSettings.repayToBps - adjustedSettings.repayGap;
-  const boostFrom = adjustedSettings.boostToBps + adjustedSettings.boostGap;
+  const repayFrom = adjustedSettings.repayToBps + adjustedSettings.repayGap;
+  const boostFrom = adjustedSettings.boostToBps - adjustedSettings.boostGap;
 
   if (state.liqUtilizationRateBps < boostFrom) {
     return adjustedSettings.boostToBps;
-  } else if (
-    state.liqUtilizationRateBps > repayFrom ||
-    repayFrom - state.liqUtilizationRateBps < repayFrom * 0.015
-  ) {
+  } else if (state.liqUtilizationRateBps > repayFrom) {
     return adjustedSettings.repayToBps;
   } else {
     throw new Error("Invalid rebalance condition");
@@ -75,11 +72,12 @@ function getStandardTargetLiqUtilizationRateBps(
 function targetLiqUtilizationRateBpsFromDCA(
   state: PositionState,
   settings: SolautoSettingsParameters,
-  dca: DCASettings
+  dca: DCASettings,
+  currentUnixTime: number
 ) {
   const adjustedSettings = getAdjustedSettingsFromAutomation(
     settings,
-    currentUnixSeconds()
+    currentUnixTime
   );
 
   let targetRateBps = 0;
@@ -106,7 +104,7 @@ function isDcaRebalance(
 
   const adjustedSettings = getAdjustedSettingsFromAutomation(
     settings,
-    currentUnixSeconds()
+    currentUnixTime
   );
 
   if (
@@ -147,7 +145,8 @@ function getTargetRateAndDcaAmount(
     const targetLiqUtilizationRateBps = targetLiqUtilizationRateBpsFromDCA(
       state,
       settings,
-      dca!
+      dca!,
+      currentUnixTime
     );
 
     return {
@@ -289,7 +288,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 () => ({