@haven-fi/solauto-sdk 1.0.597 → 1.0.599

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/services/rebalance/rebalanceValues.d.ts +1 -1
  2. package/dist/services/rebalance/rebalanceValues.d.ts.map +1 -1
  3. package/dist/services/rebalance/rebalanceValues.js +4 -3
  4. package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts +2 -1
  5. package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map +1 -1
  6. package/dist/solautoPosition/marginfiSolautoPositionEx.js +2 -1
  7. package/dist/solautoPosition/solautoPositionEx.d.ts +1 -1
  8. package/dist/solautoPosition/solautoPositionEx.d.ts.map +1 -1
  9. package/package.json +1 -1
  10. package/src/services/rebalance/rebalanceValues.ts +9 -7
  11. package/src/solautoPosition/marginfiSolautoPositionEx.ts +5 -2
  12. package/src/solautoPosition/solautoPositionEx.ts +1 -1
package/dist/services/rebalance/rebalanceValues.d.ts CHANGED
@@ -20,7 +20,7 @@ interface ApplyDebtAdjustmentResult {
20
20
  intermediaryLiqUtilizationRateBps: number;
21
21
  }
22
22
  export declare function applyDebtAdjustmentUsd(debtAdjustmentUsd: number, pos: PositionValues, liqThreshold: number, fees?: RebalanceFeesBps): ApplyDebtAdjustmentResult;
23
- export declare function getDebtAdjustment(liqThreshold: number, pos: PositionValues, targetLiqUtilizationRateBps: number, fees?: RebalanceFeesBps): DebtAdjustment;
23
+ export declare function getDebtAdjustment(liqThresholdBps: number, pos: PositionValues, targetLiqUtilizationRateBps: number, fees?: RebalanceFeesBps): DebtAdjustment;
24
24
  export interface RebalanceValues extends DebtAdjustment {
25
25
  rebalanceDirection: RebalanceDirection;
26
26
  tokenBalanceChange?: TokenBalanceChange;
package/dist/services/rebalance/rebalanceValues.d.ts.map CHANGED
@@ -1 +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,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CA6B3B;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,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"}
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,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 CHANGED
@@ -24,9 +24,10 @@ function applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, liqThreshold, fees) {
24
24
  }
25
25
  return { newPos, intermediaryLiqUtilizationRateBps };
26
26
  }
27
- function getDebtAdjustment(liqThreshold, pos, targetLiqUtilizationRateBps, fees) {
28
- const isBoost = (0, utils_1.getLiqUtilzationRateBps)(pos.supplyUsd, pos.debtUsd, (0, utils_1.toBps)(liqThreshold)) <
27
+ function getDebtAdjustment(liqThresholdBps, pos, targetLiqUtilizationRateBps, fees) {
28
+ const isBoost = (0, utils_1.getLiqUtilzationRateBps)(pos.supplyUsd, pos.debtUsd, liqThresholdBps) <
29
29
  targetLiqUtilizationRateBps;
30
+ const liqThreshold = (0, utils_1.fromBps)(liqThresholdBps);
30
31
  const targetUtilizationRate = (0, utils_1.fromBps)(targetLiqUtilizationRateBps);
31
32
  const actualizedFee = 1.0 - (0, utils_1.fromBps)(fees?.solauto ?? 0);
32
33
  const flFee = (0, utils_1.fromBps)(fees?.flashLoan ?? 0);
@@ -107,7 +108,7 @@ function getRebalanceValues(solautoPosition, targetLiqUtilizationRateBps, solaut
107
108
  lpBorrow: solautoPosition.state().debt.borrowFeeBps,
108
109
  flashLoan: flFeeBps ?? 0,
109
110
  };
110
- const debtAdjustment = getDebtAdjustment((0, utils_1.fromBps)(solautoPosition.state().liqThresholdBps), position, targetRate, fees);
111
+ const debtAdjustment = getDebtAdjustment(solautoPosition.state().liqThresholdBps, position, targetRate, fees);
111
112
  const repayingCloseToMaxLtv = rebalanceDirection === generated_1.RebalanceDirection.Repay &&
112
113
  targetRate >=
113
114
  (0, utils_1.maxRepayToBps)(solautoPosition.state().maxLtvBps, solautoPosition.state().liqThresholdBps);
package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { PublicKey } from "@solana/web3.js";
2
2
  import { SolautoPositionEx } from "./solautoPositionEx";
3
+ import { PositionState } from "../generated";
3
4
  export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
4
5
  private marginfiAccountData;
5
6
  private supplyBank;
@@ -9,6 +10,6 @@ export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
9
10
  supplyLiquidityAvailable(): bigint;
10
11
  supplyLiquidityDepositable(): bigint;
11
12
  debtLiquidityAvailable(): bigint;
12
- refreshPositionState(): Promise<void>;
13
+ refreshPositionState(): Promise<PositionState | undefined>;
13
14
  }
14
15
  //# sourceMappingURL=marginfiSolautoPositionEx.d.ts.map
package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAkBxD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;IAI1B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB5C"}
1
+ {"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAiBxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;IAI1B,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA2BjE"}
package/dist/solautoPosition/marginfiSolautoPositionEx.js CHANGED
@@ -55,7 +55,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
55
55
  }
56
56
  async refreshPositionState() {
57
57
  if (!this.canRefreshPositionState()) {
58
- return;
58
+ return this._data.state;
59
59
  }
60
60
  const useDesignatedMint = !this._data.position || !this._data.selfManaged;
61
61
  const resp = await (0, utils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.lpUserAccount }, await this.lendingPool(), useDesignatedMint
@@ -68,6 +68,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
68
68
  this.debtBank = resp.debtBank;
69
69
  this._data.state = resp.state;
70
70
  }
71
+ return resp?.state;
71
72
  }
72
73
  }
73
74
  exports.MarginfiSolautoPositionEx = MarginfiSolautoPositionEx;
package/dist/solautoPosition/solautoPositionEx.d.ts CHANGED
@@ -63,7 +63,7 @@ export declare abstract class SolautoPositionEx {
63
63
  eligibleForRebalance(bpsDistanceThreshold?: number): RebalanceAction | undefined;
64
64
  eligibleForRefresh(): boolean;
65
65
  protected canRefreshPositionState(): boolean;
66
- abstract refreshPositionState(): Promise<void>;
66
+ abstract refreshPositionState(): Promise<PositionState | undefined>;
67
67
  utilizationRateBpsDrift(): Promise<number>;
68
68
  updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<void>;
69
69
  refetchPositionData(): Promise<void>;
package/dist/solautoPosition/solautoPositionEx.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,EAYf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAqC,SAAS,EAAE,MAAM,cAAc,CAAC;AAM5E,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,SAAS;IAMT,UAAU;IAIV,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,cAAc,IAAI,SAAS;IAI3B,QAAQ,IAAI,SAAS;IAIrB,YAAY,IAAI,SAAS;IAIzB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,6BAA6B;IAI7B,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,0BAA0B,IAAI,MAAM;IAC7C,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAC3C,QAAQ,CAAC,sBAAsB,IAAI,MAAM;IAEzC,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,uBAAuB;IAiBvB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAQ/D,mBAAmB;IAOzB,iBAAiB,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM;CAsCvC"}
1
+ {"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAQL,cAAc,EAYf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAqC,SAAS,EAAE,MAAM,cAAc,CAAC;AAM5E,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,SAAS;IAMT,UAAU;IAIV,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,cAAc,IAAI,SAAS;IAI3B,QAAQ,IAAI,SAAS;IAIrB,YAAY,IAAI,SAAS;IAIzB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,6BAA6B;IAI7B,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,0BAA0B,IAAI,MAAM;IAC7C,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAC3C,QAAQ,CAAC,sBAAsB,IAAI,MAAM;IAEzC,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAE7D,uBAAuB;IAiBvB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAQ/D,mBAAmB;IAOzB,iBAAiB,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM;CAsCvC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.597",
3
+ "version": "1.0.599",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "description": "Typescript SDK for the Solauto program on the Solana blockchain",
package/src/services/rebalance/rebalanceValues.ts CHANGED
@@ -38,14 +38,15 @@ export function applyDebtAdjustmentUsd(
38
38
  debtAdjustmentUsd: number,
39
39
  pos: PositionValues,
40
40
  liqThreshold: number,
41
- fees?: RebalanceFeesBps,
41
+ fees?: RebalanceFeesBps
42
42
  ): ApplyDebtAdjustmentResult {
43
43
  const newPos = { ...pos };
44
44
  const isBoost = debtAdjustmentUsd > 0;
45
45
 
46
46
  const daMinusSolautoFees =
47
47
  debtAdjustmentUsd - debtAdjustmentUsd * fromBps(fees?.solauto ?? 0);
48
- const daWithFlashLoan = debtAdjustmentUsd * (1.0 + fromBps(fees?.flashLoan ?? 0));
48
+ const daWithFlashLoan =
49
+ debtAdjustmentUsd * (1.0 + fromBps(fees?.flashLoan ?? 0));
49
50
 
50
51
  let intermediaryLiqUtilizationRateBps = 0;
51
52
  if (isBoost) {
@@ -71,14 +72,15 @@ export function applyDebtAdjustmentUsd(
71
72
  }
72
73
 
73
74
  export function getDebtAdjustment(
74
- liqThreshold: number,
75
+ liqThresholdBps: number,
75
76
  pos: PositionValues,
76
77
  targetLiqUtilizationRateBps: number,
77
- fees?: RebalanceFeesBps,
78
+ fees?: RebalanceFeesBps
78
79
  ): DebtAdjustment {
79
80
  const isBoost =
80
- getLiqUtilzationRateBps(pos.supplyUsd, pos.debtUsd, toBps(liqThreshold)) <
81
+ getLiqUtilzationRateBps(pos.supplyUsd, pos.debtUsd, liqThresholdBps) <
81
82
  targetLiqUtilizationRateBps;
83
+ const liqThreshold = fromBps(liqThresholdBps);
82
84
 
83
85
  const targetUtilizationRate = fromBps(targetLiqUtilizationRateBps);
84
86
  const actualizedFee = 1.0 - fromBps(fees?.solauto ?? 0);
@@ -185,7 +187,7 @@ export function getRebalanceValues(
185
187
  solautoPosition: SolautoPositionEx,
186
188
  targetLiqUtilizationRateBps?: number,
187
189
  solautoFeeBps?: SolautoFeesBps,
188
- flFeeBps?: number,
190
+ flFeeBps?: number
189
191
  ): RebalanceValues {
190
192
  const tokenBalanceChange = getTokenBalanceChange();
191
193
 
@@ -211,7 +213,7 @@ export function getRebalanceValues(
211
213
  };
212
214
 
213
215
  const debtAdjustment = getDebtAdjustment(
214
- fromBps(solautoPosition.state().liqThresholdBps),
216
+ solautoPosition.state().liqThresholdBps,
215
217
  position,
216
218
  targetRate,
217
219
  fees
package/src/solautoPosition/marginfiSolautoPositionEx.ts CHANGED
@@ -16,6 +16,7 @@ import {
16
16
  toBps,
17
17
  } from "../utils";
18
18
  import { DEFAULT_MARGINFI_GROUP, MARGINFI_ACCOUNTS } from "../constants";
19
+ import { PositionState } from "../generated";
19
20
 
20
21
  export class MarginfiSolautoPositionEx extends SolautoPositionEx {
21
22
  private marginfiAccountData: MarginfiAccount | null = null;
@@ -83,9 +84,9 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
83
84
  return getBankLiquidityAvailableBaseUnit(this.debtBank, false);
84
85
  }
85
86
 
86
- async refreshPositionState(): Promise<void> {
87
+ async refreshPositionState(): Promise<PositionState | undefined> {
87
88
  if (!this.canRefreshPositionState()) {
88
- return;
89
+ return this._data.state;
89
90
  }
90
91
 
91
92
  const useDesignatedMint = !this._data.position || !this._data.selfManaged;
@@ -107,5 +108,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
107
108
  this.debtBank = resp.debtBank;
108
109
  this._data.state = resp.state;
109
110
  }
111
+
112
+ return resp?.state;
110
113
  }
111
114
  }
package/src/solautoPosition/solautoPositionEx.ts CHANGED
@@ -270,7 +270,7 @@ export abstract class SolautoPositionEx {
270
270
  return true;
271
271
  }
272
272
 
273
- abstract refreshPositionState(): Promise<void>;
273
+ abstract refreshPositionState(): Promise<PositionState | undefined>;
274
274
 
275
275
  async utilizationRateBpsDrift() {
276
276
  const supplyPrice = safeGetPrice(this.state().supply.mint) ?? 0;