@haven-fi/solauto-sdk 1.0.704 → 1.0.706

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 (17) hide show
  1. package/dist/services/rebalance/rebalanceSwapManager.d.ts.map +1 -1
  2. package/dist/services/rebalance/rebalanceSwapManager.js +11 -6
  3. package/dist/services/rebalance/rebalanceTxBuilder.d.ts.map +1 -1
  4. package/dist/services/rebalance/rebalanceTxBuilder.js +1 -0
  5. package/dist/services/rebalance/rebalanceValues.d.ts.map +1 -1
  6. package/dist/services/rebalance/rebalanceValues.js +4 -3
  7. package/dist/solautoPosition/solautoPositionEx.d.ts.map +1 -1
  8. package/dist/solautoPosition/solautoPositionEx.js +1 -0
  9. package/dist/utils/priceUtils.d.ts.map +1 -1
  10. package/dist/utils/priceUtils.js +10 -5
  11. package/local/txSandbox.ts +2 -10
  12. package/package.json +1 -1
  13. package/src/services/rebalance/rebalanceSwapManager.ts +11 -7
  14. package/src/services/rebalance/rebalanceTxBuilder.ts +2 -0
  15. package/src/services/rebalance/rebalanceValues.ts +5 -3
  16. package/src/solautoPosition/solautoPositionEx.ts +2 -1
  17. package/src/utils/priceUtils.ts +11 -5
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;YAsF5B,mBAAmB;IA0CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
package/dist/services/rebalance/rebalanceSwapManager.js CHANGED
@@ -69,9 +69,14 @@ class RebalanceSwapManager {
69
69
  ? swapOutputAmount * biasedOutputPrice
70
70
  : this.usdToSwap();
71
71
  console.log((swapInputAmount ?? 0) * inputPrice, swapInputUsd, (swapOutputAmount ?? 0) * outputPrice, swapOutputUsd);
72
+ console.log({
73
+ isBoost: this.isBoost(),
74
+ debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
75
+ debtAdjustmentUsdOutput: this.isBoost() ? swapOutputUsd : swapOutputUsd * -1,
76
+ });
72
77
  const res = (0, rebalanceValues_1.applyDebtAdjustmentUsd)({
73
78
  debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
74
- debtAdjustmentUsdOutput: swapOutputUsd,
79
+ debtAdjustmentUsdOutput: this.isBoost() ? swapOutputUsd : swapOutputUsd * -1,
75
80
  }, { supplyUsd, debtUsd }, (0, utils_1.fromBps)(this.client.pos.state.liqThresholdBps), {
76
81
  solauto: this.solautoFeeBps,
77
82
  flashLoan: this.flRequirements?.flFeeBps ?? 0,
@@ -93,15 +98,15 @@ class RebalanceSwapManager {
93
98
  swapQuote = await this.jupSwapManager.getQuote(swapInput);
94
99
  const outputAmount = parseInt(swapQuote.outAmount);
95
100
  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;
101
+ const exceedsMinOutput = criteria.minOutputAmount
102
+ ? outputAmount < Number(criteria.minOutputAmount) : false;
103
+ const exceedsMaxRate = criteria.maxLiqUtilizationRateBps ? postRebalanceRate > criteria.maxLiqUtilizationRateBps : false;
104
+ insufficient = exceedsMinOutput || exceedsMaxRate;
101
105
  (0, utils_1.consoleLog)(postRebalanceRate, criteria.maxLiqUtilizationRateBps);
102
106
  if (insufficient) {
103
107
  (0, utils_1.consoleLog)("Insufficient swap quote:", swapQuote);
104
108
  const increment = 0.01 + i * 0.01;
109
+ console.log(increment);
105
110
  swapInput.amount = this.bigIntWithIncrement(swapInput.amount, this.isBoost() ? increment * -1 : increment);
106
111
  }
107
112
  else {
package/dist/services/rebalance/rebalanceTxBuilder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAiCrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAsFpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
1
+ {"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAiCrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,YAAY,CAAC;IATvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,YAAY,CAAC,EAAE,OAAO,YAAA;IAGhC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAwC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAyBnB,sBAAsB;YAyBtB,mBAAmB;IAsFpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAiB9C"}
package/dist/services/rebalance/rebalanceTxBuilder.js CHANGED
@@ -236,6 +236,7 @@ class RebalanceTxBuilder {
236
236
  }
237
237
  async buildRebalanceTx(attemptNum) {
238
238
  await this.client.pos.refreshPositionState();
239
+ console.log(this.client.pos.eligibleForRebalance());
239
240
  if (!this.shouldProceedWithRebalance()) {
240
241
  this.client.log("Not eligible for a rebalance");
241
242
  return undefined;
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,EAGL,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,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,UAAU,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3E,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CAmC3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAiChB;AA2ED,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,SAAS,EAAE,SAAS,EACpB,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,GAAG,SAAS,CA8C7B"}
1
+ {"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,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,UAAU,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3E,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CAmC3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAiChB;AA6ED,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,SAAS,EAAE,SAAS,EACpB,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,GAAG,SAAS,CA8C7B"}
package/dist/services/rebalance/rebalanceValues.js CHANGED
@@ -60,6 +60,7 @@ function getTargetLiqUtilizationRateBps(solautoPosition, priceType, targetLiqUti
60
60
  if (targetLiqUtilizationRateBps !== undefined) {
61
61
  return targetLiqUtilizationRateBps;
62
62
  }
63
+ console.log(solautoPosition.liqUtilizationRateBps(generated_1.PriceType.Realtime), solautoPosition.repayFromBps);
63
64
  if (solautoPosition.liqUtilizationRateBps(generated_1.PriceType.Realtime) >=
64
65
  solautoPosition.repayFromBps) {
65
66
  return solautoPosition.settings.repayToBps;
@@ -97,8 +98,8 @@ function getAdjustedPositionValues(solautoPosition, priceType, tokenBalanceChang
97
98
  debtUsd,
98
99
  };
99
100
  }
100
- function getRebalanceDirection(solautoPosition, targetLtvBps) {
101
- return solautoPosition.state.liqUtilizationRateBps < targetLtvBps
101
+ function getRebalanceDirection(solautoPosition, targetLtvBps, priceType) {
102
+ return solautoPosition.liqUtilizationRateBps(priceType) < targetLtvBps
102
103
  ? generated_1.RebalanceDirection.Boost
103
104
  : generated_1.RebalanceDirection.Repay;
104
105
  }
@@ -108,7 +109,7 @@ function getRebalanceValues(solautoPosition, priceType, targetLiqUtilizationRate
108
109
  if (targetRate === undefined) {
109
110
  return undefined;
110
111
  }
111
- const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate);
112
+ const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate, priceType);
112
113
  const position = getAdjustedPositionValues(solautoPosition, priceType, tokenBalanceChange);
113
114
  const fees = {
114
115
  solauto: solautoFeeBps
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":"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"}
1
+ {"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"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"}
package/dist/solautoPosition/solautoPositionEx.js CHANGED
@@ -218,6 +218,7 @@ class PositionRebalanceHelper {
218
218
  if (!sufficientLiquidity) {
219
219
  (0, utils_1.consoleLog)("Insufficient liquidity to further boost");
220
220
  }
221
+ console.log(sufficientLiquidity);
221
222
  return sufficientLiquidity;
222
223
  }
223
224
  return true;
package/dist/utils/priceUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAerE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA0CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAqDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CA+CtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}
1
+ {"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA0CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAqDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAoDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}
package/dist/utils/priceUtils.js CHANGED
@@ -43,8 +43,8 @@ async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtim
43
43
  const newMints = mintStrs
44
44
  .filter((x) => !Object.keys(cachedPrices).includes(x))
45
45
  .map((x) => new web3_js_1.PublicKey(x));
46
- const pythMints = newMints.filter((x) => x.toString() in constants_1.PYTH_PRICE_FEED_IDS);
47
- const switchboardMints = newMints.filter((x) => x.toString() in Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS));
46
+ const pythMints = newMints.filter((x) => Object.keys(constants_1.PYTH_PRICE_FEED_IDS).includes(x.toString()));
47
+ const switchboardMints = newMints.filter((x) => Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(x.toString()));
48
48
  const otherMints = newMints.filter((x) => !pythMints.includes(x) && !switchboardMints.includes(x));
49
49
  const newPrices = Object.assign({}, ...(await Promise.all([
50
50
  getPythPrices(pythMints),
@@ -120,8 +120,8 @@ async function getSwitchboardPrices(mints) {
120
120
  try {
121
121
  prices = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
122
122
  const resp = await crossbar.simulateFeeds(mints.map((x) => constants_1.SWITCHBOARD_PRICE_FEED_IDS[x.toString()].feedHash));
123
- const prices = resp.flatMap((x) => x.results[0]);
124
- if (prices.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0)
123
+ const data = resp.flatMap((x) => x.results[0]);
124
+ if (data.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0)
125
125
  .length > 0) {
126
126
  throw new Error("Unable to fetch Switchboard prices");
127
127
  }
@@ -129,7 +129,12 @@ async function getSwitchboardPrices(mints) {
129
129
  for (const item of resp) {
130
130
  for (const [k, v] of Object.entries(constants_1.SWITCHBOARD_PRICE_FEED_IDS)) {
131
131
  if (item.feedHash === v.feedHash) {
132
- finalMap[k] = { realtimePrice: Number(item.results[0]) };
132
+ const price = Number(item.results[0]);
133
+ finalMap[k] = {
134
+ realtimePrice: price,
135
+ confInterval: price, // TODO: do we need to change if marginfi fixes their stuff?
136
+ emaConfInterval: price,
137
+ };
133
138
  }
134
139
  }
135
140
  }
package/local/txSandbox.ts CHANGED
@@ -69,14 +69,6 @@ export async function main() {
69
69
 
70
70
  // await client.pos.refreshPositionState();
71
71
 
72
- console.log(
73
- getMaxLiqUtilizationRateBps(
74
- client.pos.state.maxLtvBps,
75
- client.pos.state.liqThresholdBps,
76
- 0
77
- )
78
- );
79
-
80
72
  // const transactionItems = [
81
73
  // openSolautoPosition(client, {
82
74
  // boostGap: 100,
@@ -92,8 +84,8 @@ export async function main() {
92
84
  // repayGap: 100,
93
85
  // repayToBps: client.pos.maxRepayToBps,
94
86
  // }),
95
- deposit(client, toBaseUnit(5, client.pos.supplyMintInfo.decimals)),
96
- rebalance(client, client.pos.maxBoostToBps),
87
+ // deposit(client, toBaseUnit(5, client.pos.supplyMintInfo.decimals)),
88
+ rebalance(client),
97
89
  // withdraw(client, "All"),
98
90
  // closeSolautoPosition(client)
99
91
  // new TransactionItem(
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.706",
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
@@ -139,10 +139,15 @@ export class RebalanceSwapManager {
139
139
  swapOutputUsd
140
140
  );
141
141
 
142
+ console.log({
143
+ isBoost: this.isBoost(),
144
+ debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
145
+ debtAdjustmentUsdOutput: this.isBoost() ? swapOutputUsd : swapOutputUsd * -1,
146
+ })
142
147
  const res = applyDebtAdjustmentUsd(
143
148
  {
144
149
  debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
145
- debtAdjustmentUsdOutput: swapOutputUsd,
150
+ debtAdjustmentUsdOutput: this.isBoost() ? swapOutputUsd : swapOutputUsd * -1,
146
151
  },
147
152
  { supplyUsd, debtUsd },
148
153
  fromBps(this.client.pos.state.liqThresholdBps),
@@ -178,7 +183,6 @@ export class RebalanceSwapManager {
178
183
  swapInput: SwapInput,
179
184
  criteria: {
180
185
  minOutputAmount?: bigint;
181
- minLiqUtilizationRateBps?: number;
182
186
  maxLiqUtilizationRateBps?: number;
183
187
  }
184
188
  ): Promise<QuoteResponse> {
@@ -194,17 +198,17 @@ export class RebalanceSwapManager {
194
198
  BigInt(outputAmount),
195
199
  BigInt(parseInt(swapQuote.inAmount))
196
200
  );
197
- insufficient = criteria.minOutputAmount
198
- ? outputAmount < Number(criteria.minOutputAmount)
199
- : criteria.minLiqUtilizationRateBps
200
- ? postRebalanceRate < criteria.minLiqUtilizationRateBps
201
- : postRebalanceRate > criteria.maxLiqUtilizationRateBps!;
201
+ const exceedsMinOutput = criteria.minOutputAmount
202
+ ? outputAmount < Number(criteria.minOutputAmount) : false;
203
+ const exceedsMaxRate = criteria.maxLiqUtilizationRateBps ? postRebalanceRate > criteria.maxLiqUtilizationRateBps : false;
204
+ insufficient = exceedsMinOutput || exceedsMaxRate;
202
205
 
203
206
  consoleLog(postRebalanceRate, criteria.maxLiqUtilizationRateBps);
204
207
  if (insufficient) {
205
208
  consoleLog("Insufficient swap quote:", swapQuote);
206
209
 
207
210
  const increment = 0.01 + i * 0.01;
211
+ console.log(increment);
208
212
  swapInput.amount = this.bigIntWithIncrement(
209
213
  swapInput.amount,
210
214
  this.isBoost() ? increment * -1 : increment
package/src/services/rebalance/rebalanceTxBuilder.ts CHANGED
@@ -411,6 +411,8 @@ export class RebalanceTxBuilder {
411
411
  ): Promise<TransactionItemInputs | undefined> {
412
412
  await this.client.pos.refreshPositionState();
413
413
 
414
+ console.log(this.client.pos.eligibleForRebalance());
415
+
414
416
  if (!this.shouldProceedWithRebalance()) {
415
417
  this.client.log("Not eligible for a rebalance");
416
418
  return undefined;
package/src/services/rebalance/rebalanceValues.ts CHANGED
@@ -134,6 +134,7 @@ function getTargetLiqUtilizationRateBps(
134
134
  return targetLiqUtilizationRateBps;
135
135
  }
136
136
 
137
+ console.log(solautoPosition.liqUtilizationRateBps(PriceType.Realtime), solautoPosition.repayFromBps);
137
138
  if (
138
139
  solautoPosition.liqUtilizationRateBps(PriceType.Realtime) >=
139
140
  solautoPosition.repayFromBps
@@ -185,9 +186,10 @@ function getAdjustedPositionValues(
185
186
 
186
187
  function getRebalanceDirection(
187
188
  solautoPosition: SolautoPositionEx,
188
- targetLtvBps: number
189
+ targetLtvBps: number,
190
+ priceType: number
189
191
  ): RebalanceDirection {
190
- return solautoPosition.state.liqUtilizationRateBps < targetLtvBps
192
+ return solautoPosition.liqUtilizationRateBps(priceType) < targetLtvBps
191
193
  ? RebalanceDirection.Boost
192
194
  : RebalanceDirection.Repay;
193
195
  }
@@ -217,7 +219,7 @@ export function getRebalanceValues(
217
219
  return undefined;
218
220
  }
219
221
 
220
- const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate);
222
+ const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate, priceType);
221
223
 
222
224
  const position = getAdjustedPositionValues(
223
225
  solautoPosition,
package/src/solautoPosition/solautoPositionEx.ts CHANGED
@@ -442,9 +442,10 @@ class PositionRebalanceHelper {
442
442
  if (!sufficientLiquidity) {
443
443
  consoleLog("Insufficient liquidity to further boost");
444
444
  }
445
+ console.log(sufficientLiquidity);
445
446
  return sufficientLiquidity;
446
447
  }
447
-
448
+
448
449
  return true;
449
450
  }
450
451
 
package/src/utils/priceUtils.ts CHANGED
@@ -12,6 +12,7 @@ import {
12
12
  createRecord,
13
13
  currentUnixSeconds,
14
14
  retryWithExponentialBackoff,
15
+ tokenInfo,
15
16
  } from "./generalUtils";
16
17
  import { getJupPriceData } from "./jupiterUtils";
17
18
  import { PriceType } from "../generated";
@@ -41,9 +42,9 @@ export async function fetchTokenPrices(
41
42
  const newMints = mintStrs
42
43
  .filter((x) => !Object.keys(cachedPrices).includes(x))
43
44
  .map((x) => new PublicKey(x));
44
- const pythMints = newMints.filter((x) => x.toString() in PYTH_PRICE_FEED_IDS);
45
+ const pythMints = newMints.filter((x) => Object.keys(PYTH_PRICE_FEED_IDS).includes(x.toString()));
45
46
  const switchboardMints = newMints.filter(
46
- (x) => x.toString() in Object.keys(SWITCHBOARD_PRICE_FEED_IDS)
47
+ (x) => Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(x.toString())
47
48
  );
48
49
  const otherMints = newMints.filter(
49
50
  (x) => !pythMints.includes(x) && !switchboardMints.includes(x)
@@ -163,9 +164,9 @@ export async function getSwitchboardPrices(
163
164
  mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()].feedHash)
164
165
  );
165
166
 
166
- const prices = resp.flatMap((x) => x.results[0]);
167
+ const data = resp.flatMap((x) => x.results[0]);
167
168
  if (
168
- prices.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0)
169
+ data.filter((x) => !x || isNaN(Number(x)) || Number(x) <= 0)
169
170
  .length > 0
170
171
  ) {
171
172
  throw new Error("Unable to fetch Switchboard prices");
@@ -175,7 +176,12 @@ export async function getSwitchboardPrices(
175
176
  for (const item of resp) {
176
177
  for (const [k, v] of Object.entries(SWITCHBOARD_PRICE_FEED_IDS)) {
177
178
  if (item.feedHash === v.feedHash) {
178
- finalMap[k] = { realtimePrice: Number(item.results[0]) };
179
+ const price = Number(item.results[0]);
180
+ finalMap[k] = {
181
+ realtimePrice: price,
182
+ confInterval: price, // TODO: do we need to change if marginfi fixes their stuff?
183
+ emaConfInterval: price,
184
+ };
179
185
  }
180
186
  }
181
187
  }