@haven-fi/solauto-sdk 1.0.591 → 1.0.593

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -20,7 +20,7 @@ class RebalanceTxBuilder {
                 this.client.pos.eligibleForRebalance()));
     }
     getRebalanceValues(flFee) {
-        return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, new solautoFees_1.SolautoFeesBps(this.client.isReferred(), this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd()), flFee ?? 0, this.targetLiqUtilizationRateBps);
+        return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, this.targetLiqUtilizationRateBps, solautoFees_1.SolautoFeesBps.create(this.client.isReferred(), this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd()), flFee ?? 0);
     }
     getFlLiquiditySource(supplyLiquidityAvailable, debtLiquidityAvailable) {
         const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);

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

@@ -26,6 +26,6 @@ export interface RebalanceValues extends DebtAdjustment {
     tokenBalanceChange?: TokenBalanceChange;
     repayingCloseToMaxLtv: boolean;
 }
-export declare function getRebalanceValues(solautoPosition: SolautoPositionEx, solautoFeeBps: SolautoFeesBps, flFeeBps: number, targetLiqUtilizationRateBps?: number): RebalanceValues;
+export declare function getRebalanceValues(solautoPosition: SolautoPositionEx, targetLiqUtilizationRateBps?: number, solautoFeeBps?: SolautoFeesBps, flFeeBps?: number): RebalanceValues;
 export {};
 //# sourceMappingURL=rebalanceValues.d.ts.map

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,aAAa,EAAE,cAAc,EAC7B,QAAQ,EAAE,MAAM,EAChB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CA2CjB"}
+{"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"}

package/dist/services/rebalance/rebalanceValues.js

@@ -95,15 +95,17 @@ function getRebalanceDirection(solautoPosition, targetLtvBps) {
         ? generated_1.RebalanceDirection.Boost
         : generated_1.RebalanceDirection.Repay;
 }
-function getRebalanceValues(solautoPosition, solautoFeeBps, flFeeBps, targetLiqUtilizationRateBps) {
+function getRebalanceValues(solautoPosition, targetLiqUtilizationRateBps, solautoFeeBps, flFeeBps) {
     const tokenBalanceChange = getTokenBalanceChange();
     const targetRate = getTargetLiqUtilizationRateBps(solautoPosition, targetLiqUtilizationRateBps, tokenBalanceChange);
     const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate);
     const position = getAdjustedPositionValues(solautoPosition, tokenBalanceChange);
     const fees = {
-        solauto: solautoFeeBps.getSolautoFeesBps(rebalanceDirection).total,
+        solauto: solautoFeeBps
+            ? solautoFeeBps.getSolautoFeesBps(rebalanceDirection).total
+            : 0,
         lpBorrow: solautoPosition.state().debt.borrowFeeBps,
-        flashLoan: flFeeBps,
+        flashLoan: flFeeBps ?? 0,
     };
     const debtAdjustment = getDebtAdjustment((0, utils_1.fromBps)(solautoPosition.state().liqThresholdBps), position, fees, targetRate);
     const repayingCloseToMaxLtv = rebalanceDirection === generated_1.RebalanceDirection.Repay &&

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

@@ -4,6 +4,7 @@ export declare class SolautoFeesBps {
     private targetLiqUtilizationRateBps;
     private positionNetWorthUsd;
     constructor(isReferred: boolean, targetLiqUtilizationRateBps: number | undefined, positionNetWorthUsd: number);
+    static create(isReferred: boolean, targetLiqUtilizationRateBps: number | undefined, netWorthUsd: number): SolautoFeesBps;
     getSolautoFeesBps(rebalanceDirection: RebalanceDirection): {
         solauto: number;
         referrer: number;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoFees.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/solautoFees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,qBAAa,cAAc;IAEvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,mBAAmB;gBAFnB,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,mBAAmB,EAAE,MAAM;IAG9B,iBAAiB,CAAC,kBAAkB,EAAE,kBAAkB;;;;;CAkDhE"}
+{"version":3,"file":"solautoFees.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/solautoFees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,qBAAa,cAAc;IAEvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,mBAAmB;gBAFnB,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,mBAAmB,EAAE,MAAM;IAGrC,MAAM,CAAC,MAAM,CACX,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,WAAW,EAAE,MAAM;IASrB,iBAAiB,CAAC,kBAAkB,EAAE,kBAAkB;;;;;CAkDzD"}

package/dist/services/rebalance/solautoFees.js

@@ -9,6 +9,9 @@ class SolautoFeesBps {
         this.targetLiqUtilizationRateBps = targetLiqUtilizationRateBps;
         this.positionNetWorthUsd = positionNetWorthUsd;
     }
+    static create(isReferred, targetLiqUtilizationRateBps, netWorthUsd) {
+        return new SolautoFeesBps(isReferred, targetLiqUtilizationRateBps, netWorthUsd);
+    }
     getSolautoFeesBps(rebalanceDirection) {
         const minSize = 10000; // Minimum position size
         const maxSize = 250000; // Maximum position size

package/package.json

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

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -52,13 +52,13 @@ export class RebalanceTxBuilder {
   private getRebalanceValues(flFee?: number) {
     return getRebalanceValues(
       this.client.pos,
-      new SolautoFeesBps(
+      this.targetLiqUtilizationRateBps,
+      SolautoFeesBps.create(
         this.client.isReferred(),
         this.targetLiqUtilizationRateBps,
         this.client.pos.netWorthUsd()
       ),
       flFee ?? 0,
-      this.targetLiqUtilizationRateBps
     );
   }
 

package/src/services/rebalance/rebalanceValues.ts

@@ -183,9 +183,9 @@ export interface RebalanceValues extends DebtAdjustment {
 
 export function getRebalanceValues(
   solautoPosition: SolautoPositionEx,
-  solautoFeeBps: SolautoFeesBps,
-  flFeeBps: number,
-  targetLiqUtilizationRateBps?: number
+  targetLiqUtilizationRateBps?: number,
+  solautoFeeBps?: SolautoFeesBps,
+  flFeeBps?: number,
 ): RebalanceValues {
   const tokenBalanceChange = getTokenBalanceChange();
 
@@ -203,9 +203,11 @@ export function getRebalanceValues(
   );
 
   const fees: RebalanceFeesBps = {
-    solauto: solautoFeeBps.getSolautoFeesBps(rebalanceDirection).total,
+    solauto: solautoFeeBps
+      ? solautoFeeBps.getSolautoFeesBps(rebalanceDirection).total
+      : 0,
     lpBorrow: solautoPosition.state().debt.borrowFeeBps,
-    flashLoan: flFeeBps,
+    flashLoan: flFeeBps ?? 0,
   };
 
   const debtAdjustment = getDebtAdjustment(

package/src/services/rebalance/solautoFees.ts

@@ -8,7 +8,19 @@ export class SolautoFeesBps {
     private positionNetWorthUsd: number
   ) {}
 
-  public getSolautoFeesBps(rebalanceDirection: RebalanceDirection) {
+  static create(
+    isReferred: boolean,
+    targetLiqUtilizationRateBps: number | undefined,
+    netWorthUsd: number
+  ) {
+    return new SolautoFeesBps(
+      isReferred,
+      targetLiqUtilizationRateBps,
+      netWorthUsd
+    );
+  }
+
+  getSolautoFeesBps(rebalanceDirection: RebalanceDirection) {
     const minSize = 10_000; // Minimum position size
     const maxSize = 250_000; // Maximum position size
     const maxFeeBps = 50; // Fee in basis points for minSize (0.5%)

package/tests/unit/rebalanceCalculations.ts

@@ -11,12 +11,7 @@ import {
 import { fromBps, getLiqUtilzationRateBps } from "../../src/utils/numberUtils";
 import { getClient } from "../../src/utils/solautoUtils";
 import { USDC } from "../../src/constants/tokenConstants";
-import {
-  buildHeliusApiUrl,
-  fetchTokenPrices,
-  getSolanaRpcConnection,
-  safeGetPrice,
-} from "../../src/utils";
+import { buildIronforgeApiUrl, fetchTokenPrices, safeGetPrice } from "../../src/utils";
 import {
   createFakePositionState,
   getRebalanceValues,
@@ -24,12 +19,8 @@ import {
   SolautoClient,
 } from "../../src";
 import { SolautoFeesBps } from "../../src/services/rebalance/solautoFees";
-import { buildIronforgeApiUrl } from "../../dist";
 
 const signer = setupTest(undefined, true);
-const [conn, _] = getSolanaRpcConnection(
-  buildHeliusApiUrl(process.env.HELIUS_API_URL!)
-);
 
 function assertAccurateRebalance(
   client: SolautoClient,
@@ -38,13 +29,13 @@ function assertAccurateRebalance(
 ) {
   const { endResult } = getRebalanceValues(
     client.pos,
-    new SolautoFeesBps(
+    targetLiqUtilizationRateBps,
+    SolautoFeesBps.create(
       false,
       targetLiqUtilizationRateBps,
       client.pos.netWorthUsd()
     ),
-    50,
-    targetLiqUtilizationRateBps
+    50
   );
 
   const newLiqUtilizationRateBps = getLiqUtilzationRateBps(