@haven-fi/solauto-sdk 1.0.596 → 1.0.598

package/dist/services/rebalance/rebalanceValues.d.ts

@@ -19,8 +19,8 @@ interface ApplyDebtAdjustmentResult {
     newPos: PositionValues;
     intermediaryLiqUtilizationRateBps: number;
 }
-export declare function applyDebtAdjustmentUsd(debtAdjustmentUsd: number, pos: PositionValues, fees: RebalanceFeesBps, liqThreshold: number): ApplyDebtAdjustmentResult;
-export declare function getDebtAdjustment(liqThreshold: number, pos: PositionValues, fees: RebalanceFeesBps, targetLiqUtilizationRateBps: number): DebtAdjustment;
+export declare function applyDebtAdjustmentUsd(debtAdjustmentUsd: number, pos: PositionValues, liqThreshold: number, fees?: RebalanceFeesBps): ApplyDebtAdjustmentResult;
+export declare function getDebtAdjustment(liqThresholdBps: number, pos: PositionValues, targetLiqUtilizationRateBps: number, fees?: RebalanceFeesBps): DebtAdjustment;
 export interface RebalanceValues extends DebtAdjustment {
     rebalanceDirection: RebalanceDirection;
     tokenBalanceChange?: TokenBalanceChange;

package/dist/services/rebalance/rebalanceValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAO1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,gBAAgB,EACtB,YAAY,EAAE,MAAM,GACnB,yBAAyB,CA6B3B;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,gBAAgB,EACtB,2BAA2B,EAAE,MAAM,GAClC,cAAc,CA+BhB;AAqED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,iBAAiB,EAClC,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,CA6CjB"}
+{"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAO1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CA8B3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAgChB;AAqED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,iBAAiB,EAClC,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,CA6CjB"}

package/dist/services/rebalance/rebalanceValues.js

@@ -5,15 +5,15 @@ exports.getDebtAdjustment = getDebtAdjustment;
 exports.getRebalanceValues = getRebalanceValues;
 const generated_1 = require("../../generated");
 const utils_1 = require("../../utils");
-function applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, fees, liqThreshold) {
+function applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, liqThreshold, fees) {
     const newPos = { ...pos };
     const isBoost = debtAdjustmentUsd > 0;
-    const daMinusSolautoFees = debtAdjustmentUsd - debtAdjustmentUsd * (0, utils_1.fromBps)(fees.solauto);
-    const daWithFlashLoan = debtAdjustmentUsd * (1.0 + (0, utils_1.fromBps)(fees.flashLoan));
+    const daMinusSolautoFees = debtAdjustmentUsd - debtAdjustmentUsd * (0, utils_1.fromBps)(fees?.solauto ?? 0);
+    const daWithFlashLoan = debtAdjustmentUsd * (1.0 + (0, utils_1.fromBps)(fees?.flashLoan ?? 0));
     let intermediaryLiqUtilizationRateBps = 0;
     if (isBoost) {
         newPos.debtUsd +=
-            daWithFlashLoan * (0, utils_1.fromBps)(fees.lpBorrow) + daWithFlashLoan;
+            daWithFlashLoan * (0, utils_1.fromBps)(fees?.lpBorrow ?? 0) + daWithFlashLoan;
         intermediaryLiqUtilizationRateBps = (0, utils_1.getLiqUtilzationRateBps)(newPos.supplyUsd, newPos.debtUsd, (0, utils_1.toBps)(liqThreshold));
         newPos.supplyUsd += daMinusSolautoFees;
     }
@@ -24,13 +24,14 @@ function applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, fees, liqThreshold) {
     }
     return { newPos, intermediaryLiqUtilizationRateBps };
 }
-function getDebtAdjustment(liqThreshold, pos, fees, targetLiqUtilizationRateBps) {
-    const isBoost = (0, utils_1.getLiqUtilzationRateBps)(pos.supplyUsd, pos.debtUsd, (0, utils_1.toBps)(liqThreshold)) <
+function getDebtAdjustment(liqThresholdBps, pos, targetLiqUtilizationRateBps, fees) {
+    const isBoost = (0, utils_1.getLiqUtilzationRateBps)(pos.supplyUsd, pos.debtUsd, liqThresholdBps) <
         targetLiqUtilizationRateBps;
+    const liqThreshold = (0, utils_1.fromBps)(liqThresholdBps);
     const targetUtilizationRate = (0, utils_1.fromBps)(targetLiqUtilizationRateBps);
-    const actualizedFee = 1.0 - (0, utils_1.fromBps)(fees.solauto);
-    const flFee = (0, utils_1.fromBps)(fees.flashLoan);
-    const lpBorrowFee = (0, utils_1.fromBps)(fees.lpBorrow);
+    const actualizedFee = 1.0 - (0, utils_1.fromBps)(fees?.solauto ?? 0);
+    const flFee = (0, utils_1.fromBps)(fees?.flashLoan ?? 0);
+    const lpBorrowFee = (0, utils_1.fromBps)(fees?.lpBorrow ?? 0);
     const debtAdjustmentUsd = isBoost
         ? (targetUtilizationRate * liqThreshold * pos.supplyUsd - pos.debtUsd) /
             (1.0 +
@@ -39,7 +40,7 @@ function getDebtAdjustment(liqThreshold, pos, fees, targetLiqUtilizationRateBps)
                 targetUtilizationRate * actualizedFee * liqThreshold)
         : (targetUtilizationRate * liqThreshold * pos.supplyUsd - pos.debtUsd) /
             (actualizedFee - targetUtilizationRate * liqThreshold * (1.0 + flFee));
-    const newPos = applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, fees, liqThreshold);
+    const newPos = applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, liqThreshold, fees);
     return {
         debtAdjustmentUsd,
         endResult: newPos.newPos,
@@ -107,7 +108,7 @@ function getRebalanceValues(solautoPosition, targetLiqUtilizationRateBps, solaut
         lpBorrow: solautoPosition.state().debt.borrowFeeBps,
         flashLoan: flFeeBps ?? 0,
     };
-    const debtAdjustment = getDebtAdjustment((0, utils_1.fromBps)(solautoPosition.state().liqThresholdBps), position, fees, targetRate);
+    const debtAdjustment = getDebtAdjustment(solautoPosition.state().liqThresholdBps, position, targetRate, fees);
     const repayingCloseToMaxLtv = rebalanceDirection === generated_1.RebalanceDirection.Repay &&
         targetRate >=
             (0, utils_1.maxRepayToBps)(solautoPosition.state().maxLtvBps, solautoPosition.state().liqThresholdBps);

package/dist/solautoPosition/solautoPositionEx.js

@@ -100,8 +100,7 @@ class SolautoPositionEx {
         const limitsUpToDate = this.debtLiquidityUsdAvailable() !== 0 ||
             this.supplyLiquidityUsdDepositable() !== 0;
         if (limitsUpToDate) {
-            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state().liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, { solauto: 50, lpBorrow: 50, flashLoan: 50 }, // TODO: add better fix here instead of magic numbers
-            this.boostToBps());
+            const { debtAdjustmentUsd } = (0, rebalance_1.getDebtAdjustment)(this.state().liqThresholdBps, { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() }, this.boostToBps(), { solauto: 50, lpBorrow: 50, flashLoan: 50 });
             const sufficientLiquidity = this.debtLiquidityUsdAvailable() * 0.95 > debtAdjustmentUsd &&
                 this.supplyLiquidityUsdDepositable() * 0.95 > debtAdjustmentUsd;
             if (!sufficientLiquidity) {

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAM5E,OAAO,EACL,cAAc,EAOf,MAAM,UAAU,CAAC;AAGlB,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAgC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAM5E,OAAO,EACL,cAAc,EAQf,MAAM,UAAU,CAAC;AAElB,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAgC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}

package/dist/solautoPosition/utils.js

@@ -9,7 +9,6 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const marginfiSolautoPositionEx_1 = require("./marginfiSolautoPositionEx");
 const utils_1 = require("../utils");
-const constants_1 = require("../constants");
 function createSolautoSettings(settings) {
     return {
         boostGap: settings.boostGap,
@@ -59,8 +58,8 @@ async function getOrCreatePositionEx(umi, publicKey, customArgs, contextUpdates)
     }
 }
 function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
-    const supplyDecimals = constants_1.TOKEN_INFO[supply.mint.toString()].decimals;
-    const debtDecimals = constants_1.TOKEN_INFO[debt.mint.toString()].decimals;
+    const supplyDecimals = (0, utils_1.tokenInfo)(supply.mint).decimals;
+    const debtDecimals = (0, utils_1.tokenInfo)(debt.mint).decimals;
     const supplyUsd = (supply.amountUsed ?? 0) * (supply.price ?? 0);
     const debtUsd = (debt.amountUsed ?? 0) * (debt.price ?? 0);
     return {

package/dist/utils/numberUtils.d.ts

@@ -16,7 +16,6 @@ export declare function fromBps(value: number): number;
 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 getMaxLiqUtilizationRateBps(maxLtvBps: number, liqThresholdBps: number, offsetFromMaxLtv: number): number;
 export declare function maxRepayFromBps(maxLtvBps: number, liqThresholdBps: number): number;
 export declare function maxRepayToBps(maxLtvBps: number, liqThresholdBps: number): number;

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAIhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAI9D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,UAEjD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAE/C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;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,CAejE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAW1B;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAIhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAI9D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,UAEjD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAE/C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;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,CAejE;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}

package/dist/utils/numberUtils.js

@@ -17,7 +17,6 @@ exports.fromBps = fromBps;
 exports.toBps = toBps;
 exports.bytesToI80F48 = bytesToI80F48;
 exports.uint8ArrayToBigInt = uint8ArrayToBigInt;
-exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
 exports.getMaxLiqUtilizationRateBps = getMaxLiqUtilizationRateBps;
 exports.maxRepayFromBps = maxRepayFromBps;
 exports.maxRepayToBps = maxRepayToBps;
@@ -103,14 +102,6 @@ function uint8ArrayToBigInt(uint8Array) {
     const high = dataView.getUint32(4, true);
     return (BigInt(high) << 32n) | BigInt(low);
 }
-function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtilizationRateBps, adjustmentFeeBps) {
-    const adjustmentFee = adjustmentFeeBps && adjustmentFeeBps > 0 ? fromBps(adjustmentFeeBps) : 0;
-    const liqThreshold = fromBps(liqThresholdBps);
-    const targetLiqUtilizationRate = fromBps(targetLiqUtilizationRateBps);
-    const debtAdjustmentUsd = (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) /
-        (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
-    return debtAdjustmentUsd;
-}
 function getMaxLiqUtilizationRateBps(maxLtvBps, liqThresholdBps, offsetFromMaxLtv) {
     return (toBps((fromBps(maxLtvBps) - offsetFromMaxLtv) / fromBps(liqThresholdBps)) -
         1); // -1 to account for any rounding issues

package/package.json

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

package/src/services/rebalance/rebalanceValues.ts

@@ -37,20 +37,21 @@ interface ApplyDebtAdjustmentResult {
 export function applyDebtAdjustmentUsd(
   debtAdjustmentUsd: number,
   pos: PositionValues,
-  fees: RebalanceFeesBps,
-  liqThreshold: number
+  liqThreshold: number,
+  fees?: RebalanceFeesBps
 ): ApplyDebtAdjustmentResult {
   const newPos = { ...pos };
   const isBoost = debtAdjustmentUsd > 0;
 
   const daMinusSolautoFees =
-    debtAdjustmentUsd - debtAdjustmentUsd * fromBps(fees.solauto);
-  const daWithFlashLoan = debtAdjustmentUsd * (1.0 + fromBps(fees.flashLoan));
+    debtAdjustmentUsd - debtAdjustmentUsd * fromBps(fees?.solauto ?? 0);
+  const daWithFlashLoan =
+    debtAdjustmentUsd * (1.0 + fromBps(fees?.flashLoan ?? 0));
 
   let intermediaryLiqUtilizationRateBps = 0;
   if (isBoost) {
     newPos.debtUsd +=
-      daWithFlashLoan * fromBps(fees.lpBorrow) + daWithFlashLoan;
+      daWithFlashLoan * fromBps(fees?.lpBorrow ?? 0) + daWithFlashLoan;
     intermediaryLiqUtilizationRateBps = getLiqUtilzationRateBps(
       newPos.supplyUsd,
       newPos.debtUsd,
@@ -71,19 +72,20 @@ export function applyDebtAdjustmentUsd(
 }
 
 export function getDebtAdjustment(
-  liqThreshold: number,
+  liqThresholdBps: number,
   pos: PositionValues,
-  fees: RebalanceFeesBps,
-  targetLiqUtilizationRateBps: number
+  targetLiqUtilizationRateBps: number,
+  fees?: RebalanceFeesBps
 ): DebtAdjustment {
   const isBoost =
-    getLiqUtilzationRateBps(pos.supplyUsd, pos.debtUsd, toBps(liqThreshold)) <
+    getLiqUtilzationRateBps(pos.supplyUsd, pos.debtUsd, liqThresholdBps) <
     targetLiqUtilizationRateBps;
+  const liqThreshold = fromBps(liqThresholdBps);
 
   const targetUtilizationRate = fromBps(targetLiqUtilizationRateBps);
-  const actualizedFee = 1.0 - fromBps(fees.solauto);
-  const flFee = fromBps(fees.flashLoan);
-  const lpBorrowFee = fromBps(fees.lpBorrow);
+  const actualizedFee = 1.0 - fromBps(fees?.solauto ?? 0);
+  const flFee = fromBps(fees?.flashLoan ?? 0);
+  const lpBorrowFee = fromBps(fees?.lpBorrow ?? 0);
 
   const debtAdjustmentUsd = isBoost
     ? (targetUtilizationRate * liqThreshold * pos.supplyUsd - pos.debtUsd) /
@@ -97,8 +99,8 @@ export function getDebtAdjustment(
   const newPos = applyDebtAdjustmentUsd(
     debtAdjustmentUsd,
     pos,
-    fees,
-    liqThreshold
+    liqThreshold,
+    fees
   );
 
   return {
@@ -185,7 +187,7 @@ export function getRebalanceValues(
   solautoPosition: SolautoPositionEx,
   targetLiqUtilizationRateBps?: number,
   solautoFeeBps?: SolautoFeesBps,
-  flFeeBps?: number,
+  flFeeBps?: number
 ): RebalanceValues {
   const tokenBalanceChange = getTokenBalanceChange();
 
@@ -211,10 +213,10 @@ export function getRebalanceValues(
   };
 
   const debtAdjustment = getDebtAdjustment(
-    fromBps(solautoPosition.state().liqThresholdBps),
+    solautoPosition.state().liqThresholdBps,
     position,
-    fees,
-    targetRate
+    targetRate,
+    fees
   );
 
   const repayingCloseToMaxLtv =

package/src/solautoPosition/solautoPositionEx.ts

@@ -212,8 +212,8 @@ export abstract class SolautoPositionEx {
       const { debtAdjustmentUsd } = getDebtAdjustment(
         this.state().liqThresholdBps,
         { supplyUsd: this.supplyUsd(), debtUsd: this.debtUsd() },
-        { solauto: 50, lpBorrow: 50, flashLoan: 50 }, // TODO: add better fix here instead of magic numbers
-        this.boostToBps()
+        this.boostToBps(),
+        { solauto: 50, lpBorrow: 50, flashLoan: 50 }, // TODO: get true data here instead of magic numbers
       );
 
       const sufficientLiquidity =

package/src/solautoPosition/utils.ts

@@ -21,9 +21,9 @@ import {
   getLiqUtilzationRateBps,
   retryWithExponentialBackoff,
   toBaseUnit,
+  tokenInfo,
   toRoundedUsdValue,
 } from "../utils";
-import { TOKEN_INFO } from "../constants";
 
 export function createSolautoSettings(
   settings: SolautoSettingsParametersInpArgs
@@ -122,8 +122,8 @@ export function createFakePositionState(
   maxLtvBps: number,
   liqThresholdBps: number
 ): PositionState {
-  const supplyDecimals = TOKEN_INFO[supply.mint.toString()].decimals;
-  const debtDecimals = TOKEN_INFO[debt.mint.toString()].decimals;
+  const supplyDecimals = tokenInfo(supply.mint).decimals;
+  const debtDecimals = tokenInfo(debt.mint).decimals;
 
   const supplyUsd = (supply.amountUsed ?? 0) * (supply.price ?? 0);
   const debtUsd = (debt.amountUsed ?? 0) * (debt.price ?? 0);

package/src/utils/numberUtils.ts

@@ -132,24 +132,6 @@ export function uint8ArrayToBigInt(uint8Array: Uint8Array): bigint {
   return (BigInt(high) << 32n) | BigInt(low);
 }
 
-export function getDebtAdjustmentUsd(
-  liqThresholdBps: number,
-  supplyUsd: number,
-  debtUsd: number,
-  targetLiqUtilizationRateBps: number,
-  adjustmentFeeBps?: number
-) {
-  const adjustmentFee =
-    adjustmentFeeBps && adjustmentFeeBps > 0 ? fromBps(adjustmentFeeBps) : 0;
-  const liqThreshold = fromBps(liqThresholdBps);
-  const targetLiqUtilizationRate = fromBps(targetLiqUtilizationRateBps);
-
-  const debtAdjustmentUsd =
-    (targetLiqUtilizationRate * supplyUsd * liqThreshold - debtUsd) /
-    (1 - targetLiqUtilizationRate * (1 - adjustmentFee) * liqThreshold);
-  return debtAdjustmentUsd;
-}
-
 export function getMaxLiqUtilizationRateBps(
   maxLtvBps: number,
   liqThresholdBps: number,