@haven-fi/solauto-sdk 1.0.701 → 1.0.703

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

@@ -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,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAY3E,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;IAyCnB,OAAO,CAAC,kCAAkC;YAsC5B,mBAAmB;IA2CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}
+{"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;AAY3E,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;IAyCnB,OAAO,CAAC,kCAAkC;YA+C5B,mBAAmB;IA2CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RebalanceSwapManager = void 0;
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const swap_1 = require("../swap");
+const rebalanceValues_1 = require("./rebalanceValues");
 const generated_1 = require("../../generated");
 const utils_1 = require("../../utils");
 const solautoFees_1 = require("./solautoFees");
@@ -29,21 +30,15 @@ class RebalanceSwapManager {
         const output = this.isBoost()
             ? this.client.pos.state.supply
             : this.client.pos.state.debt;
-        // const inputPrice = safeGetPrice(
-        //   toWeb3JsPublicKey(input.mint),
-        //   this.priceType
-        // )!;
-        // const outputPrice = safeGetPrice(
-        //   toWeb3JsPublicKey(output.mint),
-        //   this.priceType
-        // )!;
+        const inputPrice = (0, utils_1.safeGetPrice)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint), this.priceType);
+        const outputPrice = (0, utils_1.safeGetPrice)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint), this.priceType);
         const supplyPrice = this.client.pos.supplyPrice(this.priceType);
         const debtPrice = this.client.pos.debtPrice(this.priceType);
         const biasedInputPrice = this.isBoost() ? debtPrice : supplyPrice;
         const biasedOutputPrice = this.isBoost() ? supplyPrice : debtPrice;
-        const inputPrice = biasedInputPrice;
-        const outputPrice = biasedOutputPrice;
-        let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / inputPrice, input.decimals);
+        // const biasedInputPrice = inputPrice;
+        // const biasedOutputPrice = outputPrice;
+        let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / biasedInputPrice, input.decimals);
         return {
             inputAmount,
             input,
@@ -62,15 +57,19 @@ class RebalanceSwapManager {
         const swapInputUsd = swapInputAmount
             ? (0, utils_1.fromBaseUnit)(swapInputAmount, (0, utils_1.tokenInfo)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint)).decimals) * biasedInputPrice
             : this.usdToSwap();
-        let swapOutputUsd = swapOutputAmount
+        const swapOutputUsd = swapOutputAmount
             ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint)).decimals) * biasedOutputPrice
             : this.usdToSwap();
-        swapOutputUsd = swapOutputUsd - swapOutputUsd * (0, utils_1.fromBps)(this.solautoFeeBps);
-        supplyUsd = this.isBoost()
-            ? supplyUsd + swapOutputUsd
-            : supplyUsd - swapInputUsd;
-        debtUsd = this.isBoost() ? debtUsd + swapInputUsd : debtUsd - swapOutputUsd;
-        return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.pos.state.liqThresholdBps ?? 0);
+        console.log(swapInputUsd, swapOutputUsd);
+        const res = (0, rebalanceValues_1.applyDebtAdjustmentUsd)({
+            debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
+            debtAdjustmentUsdOutput: swapOutputUsd,
+        }, { supplyUsd, debtUsd }, (0, utils_1.fromBps)(this.client.pos.state.liqThresholdBps), {
+            solauto: this.solautoFeeBps,
+            flashLoan: this.flRequirements?.flFeeBps ?? 0,
+            lpBorrow: this.client.pos.state.debt.borrowFeeBps,
+        });
+        return (0, utils_1.getLiqUtilzationRateBps)(res.newPos.supplyUsd, res.newPos.debtUsd, this.client.pos.state.liqThresholdBps ?? 0);
     }
     async findSufficientQuote(swapInput, criteria) {
         let swapQuote;
@@ -102,13 +101,13 @@ class RebalanceSwapManager {
     }
     async setSwapParams(attemptNum) {
         const rebalanceToZero = this.targetLiqUtilizationRateBps === 0;
-        let { input, output, outputPrice, inputAmount } = this.swapDetails();
+        let { input, output, biasedOutputPrice, inputAmount } = this.swapDetails();
         let outputAmount = rebalanceToZero
             ? output.amountUsed.baseUnit +
                 BigInt(Math.round(Number(output.amountUsed.baseUnit) *
                     // Add this small percentage to account for the APR on the debt between now and the transaction
                     0.0001))
-            : (0, utils_1.toBaseUnit)(this.usdToSwap() / outputPrice, output.decimals);
+            : (0, utils_1.toBaseUnit)(this.usdToSwap() / biasedOutputPrice, output.decimals);
         const flashLoanRepayFromDebt = !this.isBoost() &&
             this.flRequirements &&
             this.flRequirements.liquiditySource === generated_1.TokenType.Debt;

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

@@ -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;IA8EpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
+{"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"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -52,7 +52,7 @@ class RebalanceTxBuilder {
             return this.values.intermediaryLiqUtilizationRateBps;
         }
         const fees = new solautoFees_1.SolautoFeesBps(this.client.isReferred, this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd(generated_1.PriceType.Realtime));
-        const { intermediaryLiqUtilizationRateBps } = (0, rebalanceValues_1.applyDebtAdjustmentUsd)(this.values.debtAdjustmentUsd, {
+        const { intermediaryLiqUtilizationRateBps } = (0, rebalanceValues_1.applyDebtAdjustmentUsd)({ debtAdjustmentUsd: this.values.debtAdjustmentUsd }, {
             supplyUsd: this.client.pos.supplyUsd(generated_1.PriceType.Ema),
             debtUsd: this.client.pos.debtUsd(generated_1.PriceType.Ema),
         }, (0, utils_1.fromBps)(this.client.pos.state.liqThresholdBps), {
@@ -199,10 +199,12 @@ class RebalanceTxBuilder {
             priceType: this.priceType,
         };
         (0, utils_1.consoleLog)("Rebalance details:", rebalanceDetails);
-        (0, utils_1.consoleLog)("Prices:", this.client.pos.supplyPrice(this.priceType), this.client.pos.debtPrice(this.priceType));
+        (0, utils_1.consoleLog)("Prices:", (0, utils_1.safeGetPrice)(this.client.pos.supplyMint, this.priceType), this.client.pos.supplyPrice(this.priceType), (0, utils_1.safeGetPrice)(this.client.pos.debtMint, this.priceType), this.client.pos.debtPrice(this.priceType));
         if ((0, utils_1.isMarginfiPosition)(this.client.pos)) {
-            const supply = this.values.endResult.supplyUsd * (0, utils_1.bytesToI80F48)(this.client.pos.supplyBank.config.assetWeightInit.value);
-            const debt = this.values.endResult.debtUsd * (0, utils_1.bytesToI80F48)(this.client.pos.debtBank.config.liabilityWeightInit.value);
+            const supply = this.values.endResult.supplyUsd *
+                (0, utils_1.bytesToI80F48)(this.client.pos.supplyBank.config.assetWeightInit.value);
+            const debt = this.values.endResult.debtUsd *
+                (0, utils_1.bytesToI80F48)(this.client.pos.debtBank.config.liabilityWeightInit.value);
             (0, utils_1.consoleLog)("Weighted values", supply, debt);
         }
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);

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

@@ -19,7 +19,10 @@ interface ApplyDebtAdjustmentResult {
     newPos: PositionValues;
     intermediaryLiqUtilizationRateBps: number;
 }
-export declare function applyDebtAdjustmentUsd(debtAdjustmentUsd: number, pos: PositionValues, liqThreshold: number, fees?: RebalanceFeesBps): ApplyDebtAdjustmentResult;
+export declare function applyDebtAdjustmentUsd(adjustment: {
+    debtAdjustmentUsd: number;
+    debtAdjustmentUsdOutput?: 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;

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,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,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;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"}
+{"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,CAgChB;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"}

package/dist/services/rebalance/rebalanceValues.js

@@ -5,11 +5,15 @@ exports.getDebtAdjustment = getDebtAdjustment;
 exports.getRebalanceValues = getRebalanceValues;
 const generated_1 = require("../../generated");
 const utils_1 = require("../../utils");
-function applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, liqThreshold, fees) {
+function applyDebtAdjustmentUsd(adjustment, pos, liqThreshold, fees) {
     const newPos = { ...pos };
-    const isBoost = debtAdjustmentUsd > 0;
-    const daMinusSolautoFees = debtAdjustmentUsd - debtAdjustmentUsd * (0, utils_1.fromBps)(fees?.solauto ?? 0);
-    const daWithFlashLoan = debtAdjustmentUsd * (1.0 + (0, utils_1.fromBps)(fees?.flashLoan ?? 0));
+    const isBoost = adjustment.debtAdjustmentUsd > 0;
+    if (!adjustment.debtAdjustmentUsdOutput) {
+        adjustment.debtAdjustmentUsdOutput = adjustment.debtAdjustmentUsd;
+    }
+    const daMinusSolautoFees = adjustment.debtAdjustmentUsdOutput -
+        adjustment.debtAdjustmentUsdOutput * (0, utils_1.fromBps)(fees?.solauto ?? 0);
+    const daWithFlashLoan = adjustment.debtAdjustmentUsd * (1.0 + (0, utils_1.fromBps)(fees?.flashLoan ?? 0));
     let intermediaryLiqUtilizationRateBps = 0;
     if (isBoost) {
         newPos.debtUsd +=
@@ -40,7 +44,7 @@ function getDebtAdjustment(liqThresholdBps, pos, targetLiqUtilizationRateBps, fe
                 targetUtilizationRate * actualizedFee * liqThreshold)
         : (targetUtilizationRate * liqThreshold * pos.supplyUsd - pos.debtUsd) /
             (actualizedFee - targetUtilizationRate * liqThreshold * (1.0 + flFee));
-    const newPos = applyDebtAdjustmentUsd(debtAdjustmentUsd, pos, liqThreshold, fees);
+    const newPos = applyDebtAdjustmentUsd({ debtAdjustmentUsd }, pos, liqThreshold, fees);
     return {
         debtAdjustmentUsd,
         endResult: newPos.newPos,

package/dist/services/transactions/manager/transactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAmB9B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YA8I7B,qBAAqB;YAiDrB,eAAe;cA2Db,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAwDjC"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/transactionsManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,aAAa,EAId,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAEzE,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,SAAS;IAC1D,SAAS,EAAE,CAAC,CAAC;IACb,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAChE,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,SAAS;IAClD,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAC1E,SAAS,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACjD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,EAAE,0BAA0B,CAAM;IACpD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,kBAAkB,SAAmB;gBAEzB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAmB9B,uBAAuB;IA0CrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,SAAS,CAAC,4BAA4B,CACpC,SAAS,EAAE,KAAK,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM;IAcpB,OAAO,CAAC,mBAAmB;IAoBd,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA8BxB,6BAA6B;YAiJ7B,qBAAqB;YAiDrB,eAAe;cA2Db,eAAe,CAC7B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,kBAAkB;CAyDjC"}

package/dist/services/transactions/manager/transactionsManager.js

@@ -167,6 +167,7 @@ class TransactionsManager {
     }
     async processTransactionsAtomically(itemSets) {
         let num = 0;
+        let priorityFeeSetting;
         let transactions = [];
         await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => {
             if (prevError &&
@@ -175,6 +176,7 @@ class TransactionsManager {
                 throw prevError;
             }
             num = attemptNum;
+            priorityFeeSetting = this.getUpdatedPriorityFeeSetting(prevError, attemptNum);
             if (attemptNum > 0) {
                 const refreshedSets = await this.refreshItemSets(itemSets, attemptNum, prevError);
                 if (!refreshedSets || !refreshedSets.length) {
@@ -200,7 +202,7 @@ class TransactionsManager {
             let txSigs;
             let error;
             try {
-                txSigs = await (0, utils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txRunType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
+                txSigs = await (0, utils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, this.txHandler.otherSigners, transactions, this.txRunType, priorityFeeSetting, () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
             }
             catch (e) {
                 error = e;
@@ -214,7 +216,7 @@ class TransactionsManager {
             this.updateStatusForSets(itemSets, TransactionStatus.Successful, attemptNum, txSigs);
         }, this.totalRetries, this.retryDelay, this.errorsToThrow).catch((e) => {
             this.txHandler.log("Capturing error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, transactions, e, itemSets.filter((x) => this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful).length === itemSets.length);
+            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, transactions, e, itemSets.filter((x) => this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful).length === itemSets.length, priorityFeeSetting);
             const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
             const errorInfo = errorDetails.errorName || errorDetails.errorInfo
                 ? errorString
@@ -295,7 +297,7 @@ class TransactionsManager {
         }
         catch (e) {
             this.txHandler.log("Capturing error info...");
-            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, [tx], e, this.statuses.find((x) => x.name === txName)?.simulationSuccessful);
+            const errorDetails = (0, transactionUtils_1.getErrorInfo)(this.txHandler.umi, [tx], e, this.statuses.find((x) => x.name === txName)?.simulationSuccessful, priorityFeeSetting);
             const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
             const errorInfo = errorDetails.errorName || errorDetails.errorInfo
                 ? errorString

package/dist/services/transactions/transactionUtils.d.ts

@@ -1,13 +1,14 @@
 import { PublicKey } from "@solana/web3.js";
 import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { SolautoClient, ReferralStateManager } from "../solauto";
-import { TransactionItemInputs } from "../../types";
+import { TransactionItemInputs, PriorityFeeSetting } from "../../types";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;
 export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<TransactionItemInputs | undefined>;
-export declare function getErrorInfo(umi: Umi, txs: TransactionBuilder[], error: Error, simulationSuccessful?: boolean): {
+export declare function getErrorInfo(umi: Umi, txs: TransactionBuilder[], error: Error, simulationSuccessful?: boolean, priorityFeeSetting?: PriorityFeeSetting): {
     errorName: string | undefined;
     errorInfo: string | undefined;
     canBeIgnored: boolean;
 };
+export declare function usePriorityFee(priorityFeeSetting?: PriorityFeeSetting): priorityFeeSetting is PriorityFeeSetting.Min | PriorityFeeSetting.Low | PriorityFeeSetting.Default | PriorityFeeSetting.High | PriorityFeeSetting.VeryHigh;
 //# sourceMappingURL=transactionUtils.d.ts.map

package/dist/services/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EAAE,qBAAqB,EAAyB,MAAM,aAAa,CAAC;AAwL3E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA+LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EAuH/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EAAE,qBAAqB,EAAyB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAwL/F,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA+LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO,EAC9B,kBAAkB,CAAC,EAAE,kBAAkB;;;;EAuHxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAErE"}

package/dist/services/transactions/transactionUtils.js

@@ -4,6 +4,7 @@ exports.rebalanceChoresBefore = rebalanceChoresBefore;
 exports.getTransactionChores = getTransactionChores;
 exports.convertReferralFeesToDestination = convertReferralFeesToDestination;
 exports.getErrorInfo = getErrorInfo;
+exports.usePriorityFee = usePriorityFee;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const umi_1 = require("@metaplex-foundation/umi");
@@ -339,7 +340,7 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         .add(swapIx);
     return { tx, lookupTableAddresses };
 }
-function getErrorInfo(umi, txs, error, simulationSuccessful) {
+function getErrorInfo(umi, txs, error, simulationSuccessful, priorityFeeSetting) {
     let canBeIgnored = false;
     let errorName = undefined;
     let errorInfo = undefined;
@@ -348,7 +349,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
     let errCode;
     let errName;
     // sub ixs to account for computeUnitLimit and computeUnitPrice that get added
-    const getComputeIxs = (txIdx) => (0, utils_1.addTxOptimizations)(umi, txs[txIdx], 1, simulationSuccessful ? 1 : undefined).getInstructions().length - txs[txIdx].getInstructions().length;
+    const getComputeIxs = (txIdx) => (0, utils_1.addTxOptimizations)(umi, txs[txIdx], usePriorityFee(priorityFeeSetting) ? 1 : undefined, simulationSuccessful ? 1 : undefined).getInstructions().length - txs[txIdx].getInstructions().length;
     try {
         if (error instanceof types_1.BundleSimulationError) {
             errTxIdx = error.details.transactionIdx;
@@ -423,3 +424,6 @@ function getErrorInfo(umi, txs, error, simulationSuccessful) {
     (0, utils_1.consoleLog)(errData);
     return errData;
 }
+function usePriorityFee(priorityFeeSetting) {
+    return priorityFeeSetting !== undefined && priorityFeeSetting !== types_1.PriorityFeeSetting.None;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAelE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAkGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAwHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAgBlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAkGD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB/D;AAwHD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}

package/dist/utils/jitoUtils.js

@@ -14,6 +14,7 @@ const types_2 = require("../types");
 const solanaUtils_1 = require("./solanaUtils");
 const generalUtils_1 = require("./generalUtils");
 const bs58_1 = __importDefault(require("bs58"));
+const services_1 = require("../services");
 function getRandomTipAccount() {
     const randomInt = Math.floor(Math.random() * constants_1.JITO_TIP_ACCOUNTS.length);
     return new web3_js_1.PublicKey(constants_1.JITO_TIP_ACCOUNTS[randomInt]);
@@ -190,7 +191,7 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
     (0, generalUtils_1.consoleLog)(txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString())));
     (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
     txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150000));
-    const feeEstimates = priorityFeeSetting !== types_1.PriorityFeeSetting.None
+    const feeEstimates = (0, services_1.usePriorityFee)(priorityFeeSetting)
         ? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting, true)) ?? 1000000))
         : undefined;
     const latestBlockhash = (await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })).blockhash;

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,WAAW,EACX,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAe9E,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,SAAS,EACrB,KAAK,CAAC,EAAE,UAAU,GACjB,CAAC,UAAU,EAAE,GAAG,CAAC,CAWnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,SAAS,EACjB,QAAQ,GAAE,OAAe,EACzB,UAAU,GAAE,OAAe,GAC1B,WAAW,CAEb;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAsB1B;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;AA+CD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA4DjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solanaUtils.js

@@ -31,6 +31,7 @@ const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
 const solautoUtils_1 = require("./solautoUtils");
 const marginfi_1 = require("./marginfi");
+const services_1 = require("../services");
 function getSolanaRpcConnection(rpcUrl, programId, lpEnv) {
     const connection = new web3_js_1.Connection(rpcUrl, {
         commitment: "confirmed",
@@ -270,7 +271,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
         (0, generalUtils_1.consoleLog)("Compute unit limit: ", cuLimit);
     }
     let cuPrice;
-    if (prioritySetting !== types_1.PriorityFeeSetting.None) {
+    if ((0, services_1.usePriorityFee)(prioritySetting)) {
         cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
         cuPrice = Math.min(cuPrice ?? 0, 100000000);
         (0, generalUtils_1.consoleLog)("Compute unit price: ", cuPrice);

package/package.json

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

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -3,7 +3,7 @@ import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { JupSwapManager, SwapParams, SwapInput } from "../swap";
-import { RebalanceValues } from "./rebalanceValues";
+import { applyDebtAdjustmentUsd, RebalanceValues } from "./rebalanceValues";
 import { PriceType, RebalanceDirection, TokenType } from "../../generated";
 import {
   consoleLog,
@@ -55,25 +55,25 @@ export class RebalanceSwapManager {
       ? this.client.pos.state.supply
       : this.client.pos.state.debt;
 
-    // const inputPrice = safeGetPrice(
-    //   toWeb3JsPublicKey(input.mint),
-    //   this.priceType
-    // )!;
-    // const outputPrice = safeGetPrice(
-    //   toWeb3JsPublicKey(output.mint),
-    //   this.priceType
-    // )!;
+    const inputPrice = safeGetPrice(
+      toWeb3JsPublicKey(input.mint),
+      this.priceType
+    )!;
+    const outputPrice = safeGetPrice(
+      toWeb3JsPublicKey(output.mint),
+      this.priceType
+    )!;
 
     const supplyPrice = this.client.pos.supplyPrice(this.priceType)!;
     const debtPrice = this.client.pos.debtPrice(this.priceType)!;
     const biasedInputPrice = this.isBoost() ? debtPrice : supplyPrice;
     const biasedOutputPrice = this.isBoost() ? supplyPrice : debtPrice;
 
-    const inputPrice = biasedInputPrice;
-    const outputPrice = biasedOutputPrice;
+    // const biasedInputPrice = inputPrice;
+    // const biasedOutputPrice = outputPrice;
 
     let inputAmount = toBaseUnit(
-      this.usdToSwap() / inputPrice!,
+      this.usdToSwap() / biasedInputPrice!,
       input.decimals
     );
 
@@ -106,22 +106,31 @@ export class RebalanceSwapManager {
         ) * biasedInputPrice
       : this.usdToSwap();
 
-    let swapOutputUsd = swapOutputAmount
+    const swapOutputUsd = swapOutputAmount
       ? fromBaseUnit(
           swapOutputAmount,
           tokenInfo(toWeb3JsPublicKey(output.mint)).decimals
         ) * biasedOutputPrice
       : this.usdToSwap();
-    swapOutputUsd = swapOutputUsd - swapOutputUsd * fromBps(this.solautoFeeBps);
 
-    supplyUsd = this.isBoost()
-      ? supplyUsd + swapOutputUsd
-      : supplyUsd - swapInputUsd;
-    debtUsd = this.isBoost() ? debtUsd + swapInputUsd : debtUsd - swapOutputUsd;
+    console.log(swapInputUsd, swapOutputUsd);
+    const res = applyDebtAdjustmentUsd(
+      {
+        debtAdjustmentUsd: this.isBoost() ? swapInputUsd : swapInputUsd * -1,
+        debtAdjustmentUsdOutput: swapOutputUsd,
+      },
+      { supplyUsd, debtUsd },
+      fromBps(this.client.pos.state.liqThresholdBps),
+      {
+        solauto: this.solautoFeeBps,
+        flashLoan: this.flRequirements?.flFeeBps ?? 0,
+        lpBorrow: this.client.pos.state.debt.borrowFeeBps,
+      }
+    );
 
     return getLiqUtilzationRateBps(
-      supplyUsd,
-      debtUsd,
+      res.newPos.supplyUsd,
+      res.newPos.debtUsd,
       this.client.pos.state.liqThresholdBps ?? 0
     );
   }
@@ -175,7 +184,7 @@ export class RebalanceSwapManager {
 
   async setSwapParams(attemptNum: number) {
     const rebalanceToZero = this.targetLiqUtilizationRateBps === 0;
-    let { input, output, outputPrice, inputAmount } = this.swapDetails();
+    let { input, output, biasedOutputPrice, inputAmount } = this.swapDetails();
 
     let outputAmount = rebalanceToZero
       ? output.amountUsed.baseUnit +
@@ -186,7 +195,7 @@ export class RebalanceSwapManager {
               0.0001
           )
         )
-      : toBaseUnit(this.usdToSwap() / outputPrice, output.decimals);
+      : toBaseUnit(this.usdToSwap() / biasedOutputPrice, output.decimals);
 
     const flashLoanRepayFromDebt =
       !this.isBoost() &&

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -136,7 +136,7 @@ export class RebalanceTxBuilder {
     );
 
     const { intermediaryLiqUtilizationRateBps } = applyDebtAdjustmentUsd(
-      this.values.debtAdjustmentUsd,
+      { debtAdjustmentUsd: this.values.debtAdjustmentUsd },
       {
         supplyUsd: this.client.pos.supplyUsd(PriceType.Ema),
         debtUsd: this.client.pos.debtUsd(PriceType.Ema),
@@ -345,13 +345,21 @@ export class RebalanceTxBuilder {
     consoleLog("Rebalance details:", rebalanceDetails);
     consoleLog(
       "Prices:",
+      safeGetPrice(this.client.pos.supplyMint, this.priceType),
       this.client.pos.supplyPrice(this.priceType),
+      safeGetPrice(this.client.pos.debtMint, this.priceType),
       this.client.pos.debtPrice(this.priceType)
     );
 
     if (isMarginfiPosition(this.client.pos)) {
-      const supply = this.values.endResult.supplyUsd * bytesToI80F48(this.client.pos.supplyBank!.config.assetWeightInit.value);
-      const debt = this.values.endResult.debtUsd * bytesToI80F48(this.client.pos.debtBank!.config.liabilityWeightInit.value);
+      const supply =
+        this.values.endResult.supplyUsd *
+        bytesToI80F48(this.client.pos.supplyBank!.config.assetWeightInit.value);
+      const debt =
+        this.values.endResult.debtUsd *
+        bytesToI80F48(
+          this.client.pos.debtBank!.config.liabilityWeightInit.value
+        );
       consoleLog("Weighted values", supply, debt);
     }
 

package/src/services/rebalance/rebalanceValues.ts

@@ -38,18 +38,23 @@ interface ApplyDebtAdjustmentResult {
 }
 
 export function applyDebtAdjustmentUsd(
-  debtAdjustmentUsd: number,
+  adjustment: { debtAdjustmentUsd: number; debtAdjustmentUsdOutput?: number },
   pos: PositionValues,
   liqThreshold: number,
   fees?: RebalanceFeesBps
 ): ApplyDebtAdjustmentResult {
   const newPos = { ...pos };
-  const isBoost = debtAdjustmentUsd > 0;
+  const isBoost = adjustment.debtAdjustmentUsd > 0;
 
+  if (!adjustment.debtAdjustmentUsdOutput) {
+    adjustment.debtAdjustmentUsdOutput = adjustment.debtAdjustmentUsd;
+  }
   const daMinusSolautoFees =
-    debtAdjustmentUsd - debtAdjustmentUsd * fromBps(fees?.solauto ?? 0);
+    adjustment.debtAdjustmentUsdOutput -
+    adjustment.debtAdjustmentUsdOutput * fromBps(fees?.solauto ?? 0);
+
   const daWithFlashLoan =
-    debtAdjustmentUsd * (1.0 + fromBps(fees?.flashLoan ?? 0));
+    adjustment.debtAdjustmentUsd * (1.0 + fromBps(fees?.flashLoan ?? 0));
 
   let intermediaryLiqUtilizationRateBps = 0;
   if (isBoost) {
@@ -100,7 +105,7 @@ export function getDebtAdjustment(
       (actualizedFee - targetUtilizationRate * liqThreshold * (1.0 + flFee));
 
   const newPos = applyDebtAdjustmentUsd(
-    debtAdjustmentUsd,
+    { debtAdjustmentUsd },
     pos,
     liqThreshold,
     fees

package/src/services/transactions/manager/transactionsManager.ts

@@ -269,6 +269,7 @@ export class TransactionsManager<T extends TxHandler> {
 
   private async processTransactionsAtomically(itemSets: TransactionSet[]) {
     let num = 0;
+    let priorityFeeSetting: PriorityFeeSetting;
     let transactions: TransactionBuilder[] = [];
 
     await retryWithExponentialBackoff(
@@ -282,6 +283,7 @@ export class TransactionsManager<T extends TxHandler> {
         }
 
         num = attemptNum;
+        priorityFeeSetting = this.getUpdatedPriorityFeeSetting(prevError, attemptNum);
 
         if (attemptNum > 0) {
           const refreshedSets = await this.refreshItemSets(
@@ -334,7 +336,7 @@ export class TransactionsManager<T extends TxHandler> {
             this.txHandler.otherSigners,
             transactions,
             this.txRunType,
-            this.getUpdatedPriorityFeeSetting(prevError, attemptNum),
+            priorityFeeSetting,
             () =>
               this.updateStatusForSets(
                 itemSets,
@@ -383,7 +385,8 @@ export class TransactionsManager<T extends TxHandler> {
         itemSets.filter(
           (x) =>
             this.statuses.find((y) => x.name() === y.name)?.simulationSuccessful
-        ).length === itemSets.length
+        ).length === itemSets.length,
+        priorityFeeSetting
       );
 
       const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
@@ -553,7 +556,8 @@ export class TransactionsManager<T extends TxHandler> {
         this.txHandler.umi,
         [tx],
         e,
-        this.statuses.find((x) => x.name === txName)?.simulationSuccessful
+        this.statuses.find((x) => x.name === txName)?.simulationSuccessful,
+        priorityFeeSetting
       );
 
       const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;

package/src/services/transactions/transactionUtils.ts

@@ -56,7 +56,7 @@ import {
   getJupiterErrorFromCode,
   JUPITER_PROGRAM_ID,
 } from "../../jupiter-sdk";
-import { TransactionItemInputs, BundleSimulationError } from "../../types";
+import { TransactionItemInputs, BundleSimulationError, PriorityFeeSetting } from "../../types";
 import { isMarginfiProgram } from "../../constants";
 
 interface wSolTokenUsage {
@@ -604,7 +604,8 @@ export function getErrorInfo(
   umi: Umi,
   txs: TransactionBuilder[],
   error: Error,
-  simulationSuccessful?: boolean
+  simulationSuccessful?: boolean,
+  priorityFeeSetting?: PriorityFeeSetting
 ) {
   let canBeIgnored = false;
   let errorName: string | undefined = undefined;
@@ -620,7 +621,7 @@ export function getErrorInfo(
     addTxOptimizations(
       umi,
       txs[txIdx],
-      1,
+      usePriorityFee(priorityFeeSetting) ? 1 : undefined,
       simulationSuccessful ? 1 : undefined
     ).getInstructions().length - txs[txIdx].getInstructions().length;
 
@@ -724,3 +725,7 @@ export function getErrorInfo(
 
   return errData;
 }
+
+export function usePriorityFee(priorityFeeSetting?: PriorityFeeSetting) {
+  return priorityFeeSetting !== undefined && priorityFeeSetting !== PriorityFeeSetting.None;
+}

package/src/utils/jitoUtils.ts

@@ -28,6 +28,7 @@ import {
   retryWithExponentialBackoff,
 } from "./generalUtils";
 import base58 from "bs58";
+import { usePriorityFee } from "../services";
 
 export function getRandomTipAccount(): PublicKey {
   const randomInt = Math.floor(Math.random() * JITO_TIP_ACCOUNTS.length);
@@ -303,7 +304,7 @@ export async function sendJitoBundledTransactions(
   txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150_000));
 
   const feeEstimates =
-    priorityFeeSetting !== PriorityFeeSetting.None
+    usePriorityFee(priorityFeeSetting)
       ? await Promise.all(
           txs.map(
             async (x) =>

package/src/utils/solanaUtils.ts

@@ -48,6 +48,7 @@ import {
 } from "./generalUtils";
 import { createDynamicSolautoProgram } from "./solautoUtils";
 import { createDynamicMarginfiProgram } from "./marginfi";
+import { usePriorityFee } from "../services";
 
 export function getSolanaRpcConnection(
   rpcUrl: string,
@@ -469,7 +470,7 @@ export async function sendSingleOptimizedTransaction(
   }
 
   let cuPrice: number | undefined;
-  if (prioritySetting !== PriorityFeeSetting.None) {
+  if (usePriorityFee(prioritySetting)) {
     cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
     cuPrice = Math.min(cuPrice ?? 0, 100_000_000);
     consoleLog("Compute unit price: ", cuPrice);