@haven-fi/solauto-sdk 1.0.704 → 1.0.705

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 (4) hide show
  1. package/dist/services/rebalance/rebalanceSwapManager.d.ts.map +1 -1
  2. package/dist/services/rebalance/rebalanceSwapManager.js +5 -6
  3. package/package.json +1 -1
  4. package/src/services/rebalance/rebalanceSwapManager.ts +5 -7
package/dist/services/rebalance/rebalanceSwapManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAc3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IA4CnB,OAAO,CAAC,kCAAkC;YAiF5B,mBAAmB;IA2CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
1
+ {"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAc3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IA4CnB,OAAO,CAAC,kCAAkC;YAiF5B,mBAAmB;IAyCjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
package/dist/services/rebalance/rebalanceSwapManager.js CHANGED
@@ -71,7 +71,7 @@ class RebalanceSwapManager {
71
71
  console.log((swapInputAmount ?? 0) * inputPrice, swapInputUsd, (swapOutputAmount ?? 0) * outputPrice, swapOutputUsd);
72
72
  const res = (0, rebalanceValues_1.applyDebtAdjustmentUsd)({
73
73
  debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
74
- debtAdjustmentUsdOutput: swapOutputUsd,
74
+ debtAdjustmentUsdOutput: this.isBoost() ? swapOutputUsd : swapOutputUsd * -1,
75
75
  }, { supplyUsd, debtUsd }, (0, utils_1.fromBps)(this.client.pos.state.liqThresholdBps), {
76
76
  solauto: this.solautoFeeBps,
77
77
  flashLoan: this.flRequirements?.flFeeBps ?? 0,
@@ -93,11 +93,10 @@ class RebalanceSwapManager {
93
93
  swapQuote = await this.jupSwapManager.getQuote(swapInput);
94
94
  const outputAmount = parseInt(swapQuote.outAmount);
95
95
  const postRebalanceRate = this.postRebalanceLiqUtilizationRateBps(BigInt(outputAmount), BigInt(parseInt(swapQuote.inAmount)));
96
- insufficient = criteria.minOutputAmount
97
- ? outputAmount < Number(criteria.minOutputAmount)
98
- : criteria.minLiqUtilizationRateBps
99
- ? postRebalanceRate < criteria.minLiqUtilizationRateBps
100
- : postRebalanceRate > criteria.maxLiqUtilizationRateBps;
96
+ const exceedsMinOutput = criteria.minOutputAmount
97
+ ? outputAmount < Number(criteria.minOutputAmount) : false;
98
+ const exceedsMaxRate = criteria.maxLiqUtilizationRateBps ? postRebalanceRate > criteria.maxLiqUtilizationRateBps : false;
99
+ insufficient = exceedsMinOutput || exceedsMaxRate;
101
100
  (0, utils_1.consoleLog)(postRebalanceRate, criteria.maxLiqUtilizationRateBps);
102
101
  if (insufficient) {
103
102
  (0, utils_1.consoleLog)("Insufficient swap quote:", swapQuote);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.704",
3
+ "version": "1.0.705",
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/rebalanceSwapManager.ts CHANGED
@@ -142,7 +142,7 @@ export class RebalanceSwapManager {
142
142
  const res = applyDebtAdjustmentUsd(
143
143
  {
144
144
  debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
145
- debtAdjustmentUsdOutput: swapOutputUsd,
145
+ debtAdjustmentUsdOutput: this.isBoost() ? swapOutputUsd : swapOutputUsd * -1,
146
146
  },
147
147
  { supplyUsd, debtUsd },
148
148
  fromBps(this.client.pos.state.liqThresholdBps),
@@ -178,7 +178,6 @@ export class RebalanceSwapManager {
178
178
  swapInput: SwapInput,
179
179
  criteria: {
180
180
  minOutputAmount?: bigint;
181
- minLiqUtilizationRateBps?: number;
182
181
  maxLiqUtilizationRateBps?: number;
183
182
  }
184
183
  ): Promise<QuoteResponse> {
@@ -194,11 +193,10 @@ export class RebalanceSwapManager {
194
193
  BigInt(outputAmount),
195
194
  BigInt(parseInt(swapQuote.inAmount))
196
195
  );
197
- insufficient = criteria.minOutputAmount
198
- ? outputAmount < Number(criteria.minOutputAmount)
199
- : criteria.minLiqUtilizationRateBps
200
- ? postRebalanceRate < criteria.minLiqUtilizationRateBps
201
- : postRebalanceRate > criteria.maxLiqUtilizationRateBps!;
196
+ const exceedsMinOutput = criteria.minOutputAmount
197
+ ? outputAmount < Number(criteria.minOutputAmount) : false;
198
+ const exceedsMaxRate = criteria.maxLiqUtilizationRateBps ? postRebalanceRate > criteria.maxLiqUtilizationRateBps : false;
199
+ insufficient = exceedsMinOutput || exceedsMaxRate;
202
200
 
203
201
  consoleLog(postRebalanceRate, criteria.maxLiqUtilizationRateBps);
204
202
  if (insufficient) {