@haven-fi/solauto-sdk 1.0.699 → 1.0.700

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;AAU3E,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAXb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,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;IAK/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IA6BnB,OAAO,CAAC,kCAAkC;YA4B5B,mBAAmB;IAoCjC,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,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAU3E,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAXb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,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;IAK/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAyCnB,OAAO,CAAC,kCAAkC;YAqC5B,mBAAmB;IA2CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAyEhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -27,53 +27,66 @@ class RebalanceSwapManager {
         const output = this.isBoost()
             ? this.client.pos.state.supply
             : this.client.pos.state.debt;
-        // const supplyPrice = this.client.pos.supplyPrice(this.priceType)!;
-        // const debtPrice = this.client.pos.debtPrice(this.priceType)!;
-        // const inputPrice = this.isBoost() ? debtPrice : supplyPrice;
-        // const outputPrice = this.isBoost() ? supplyPrice : debtPrice;
-        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 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;
         let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / inputPrice, input.decimals);
         return {
             inputAmount,
             input,
             inputPrice,
+            biasedInputPrice,
             output,
             outputPrice,
+            biasedOutputPrice,
         };
     }
-    postRebalanceLiqUtilizationRateBps(swapOutputAmount) {
+    postRebalanceLiqUtilizationRateBps(swapOutputAmount, swapInputAmount) {
         let supplyUsd = this.client.pos.supplyUsd(this.priceType);
         let debtUsd = this.client.pos.debtUsd(this.priceType);
         // TODO: add token balance change
-        const { output, outputPrice } = this.swapDetails();
+        const { input, biasedInputPrice, output, biasedOutputPrice } = this.swapDetails();
+        const swapInputUsd = swapInputAmount
+            ? (0, utils_1.fromBaseUnit)(swapInputAmount, (0, utils_1.tokenInfo)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint)).decimals) * biasedInputPrice
+            : this.usdToSwap();
         const swapOutputUsd = swapOutputAmount
-            ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint)).decimals) * outputPrice
+            ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint)).decimals) * biasedOutputPrice
             : this.usdToSwap();
         supplyUsd = this.isBoost()
             ? supplyUsd + swapOutputUsd
-            : supplyUsd - this.usdToSwap();
-        debtUsd = this.isBoost()
-            ? debtUsd + this.usdToSwap()
-            : debtUsd - swapOutputUsd;
+            : supplyUsd - swapInputUsd;
+        debtUsd = this.isBoost() ? debtUsd + swapInputUsd : debtUsd - swapOutputUsd;
         return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.pos.state.liqThresholdBps ?? 0);
     }
     async findSufficientQuote(swapInput, criteria) {
         let swapQuote;
         let insufficient = false;
-        for (let i = 0; i < 10; i++) {
+        for (let i = 0; i < 20; i++) {
             (0, utils_1.consoleLog)("Finding sufficient quote...");
             swapQuote = await this.jupSwapManager.getQuote(swapInput);
             const outputAmount = parseInt(swapQuote.outAmount);
-            const postRebalanceRate = this.postRebalanceLiqUtilizationRateBps(BigInt(outputAmount));
+            const postRebalanceRate = this.postRebalanceLiqUtilizationRateBps(BigInt(outputAmount), BigInt(parseInt(swapQuote.inAmount)));
             insufficient = criteria.minOutputAmount
                 ? outputAmount < Number(criteria.minOutputAmount)
                 : criteria.minLiqUtilizationRateBps
                     ? postRebalanceRate < criteria.minLiqUtilizationRateBps
                     : postRebalanceRate > criteria.maxLiqUtilizationRateBps;
+            (0, utils_1.consoleLog)(postRebalanceRate, criteria.maxLiqUtilizationRateBps);
             if (insufficient) {
                 (0, utils_1.consoleLog)("Insufficient swap quote:", swapQuote);
-                swapInput.amount = this.bigIntWithIncrement(swapInput.amount, 0.01);
+                const increment = 0.01 + i * 0.005;
+                swapInput.amount = this.bigIntWithIncrement(swapInput.amount, this.isBoost() ? increment * -1 : increment);
             }
             else {
                 break;
@@ -116,11 +129,11 @@ class RebalanceSwapManager {
             amount: swapAmount,
         };
         (0, utils_1.consoleLog)("Swap input:", swapInput);
-        if (exactIn && (rebalanceToZero || this.values.repayingCloseToMaxLtv)) {
+        if (exactIn) {
             this.swapQuote = await this.findSufficientQuote(swapInput, {
                 minOutputAmount: rebalanceToZero ? outputAmount : undefined,
-                maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
-                    ? this.client.pos.maxRepayToBps - 15
+                maxLiqUtilizationRateBps: !rebalanceToZero
+                    ? this.client.pos.maxBoostToBps
                     : undefined,
             });
         }

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

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -200,6 +200,11 @@ class RebalanceTxBuilder {
         };
         (0, utils_1.consoleLog)("Rebalance details:", rebalanceDetails);
         (0, utils_1.consoleLog)("Prices:", this.client.pos.supplyPrice(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);
+            (0, utils_1.consoleLog)("Weighted values", supply, debt);
+        }
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);
         const lastRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PostSwap, rebalanceDetails);
         if (!flashLoanDetails) {

package/dist/services/solauto/solautoClient.d.ts

@@ -58,7 +58,7 @@ export declare abstract class SolautoClient extends ReferralStateManager {
     updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder;
     abstract closePositionIx(): TransactionBuilder;
     cancelDCAIx(): TransactionBuilder;
-    abstract refreshIx(priceType: PriceType): TransactionBuilder;
+    abstract refreshIx(priceType?: PriceType): TransactionBuilder;
     protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder;
     abstract rebalanceIx(rebalanceStep: RebalanceStep, data: RebalanceDetails): TransactionBuilder;
 }

package/dist/services/solauto/solautoClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/services/solauto/solautoMarginfiClient.d.ts

@@ -22,7 +22,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     openPositionIx(settings?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
     private marginfiOpenPositionIx;
     closePositionIx(): TransactionBuilder;
-    refreshIx(priceType: PriceType): TransactionBuilder;
+    refreshIx(priceType?: PriceType): TransactionBuilder;
     protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder;
     private marginfiProtocolInteractionIx;
     private marginfiSolautoProtocolInteractionIx;

package/dist/services/solauto/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAmBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,4BAA4B,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7C,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA6ExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAenD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAkFrC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CA4EtB"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAmBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,4BAA4B,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7C,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA6ExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAepD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAkFrC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CA4EtB"}

package/dist/services/solauto/solautoMarginfiClient.js

@@ -140,7 +140,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
-            priceType,
+            priceType: priceType ?? generated_1.PriceType.Realtime,
         });
     }
     protocolInteractionIx(args) {

package/dist/services/swap/jupSwapManager.js

@@ -24,7 +24,7 @@ class JupSwapManager {
                     ? "ExactIn"
                     : undefined,
             slippageBps,
-            maxAccounts: !data.exactOut ? 15 + attemptNum * 5 : undefined,
+            maxAccounts: !data.exactOut ? (memeSwap ? 25 : 15) + attemptNum * 5 : undefined,
         }), 4, 150);
     }
     async getJupInstructions(data) {

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -5,8 +5,8 @@ import { LendingPlatform, PriceType } from "../generated";
 export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     lendingPlatform: LendingPlatform;
     maxLtvPriceType: PriceType;
-    private supplyBank;
-    private debtBank;
+    supplyBank: Bank | null;
+    debtBank: Bank | null;
     supplyPrice(priceType?: PriceType): number | undefined;
     debtPrice(priceType?: PriceType): number | undefined;
     private getBankAccounts;

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map

@@ -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,IAAI,EAA+B,MAAM,iBAAiB,CAAC;AAepE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEhC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAErC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAItD,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}
+{"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,IAAI,EAA+B,MAAM,iBAAiB,CAAC;AAepE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEzB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAC/B,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEpC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAItD,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}

package/dist/utils/jitoUtils.js

@@ -82,7 +82,7 @@ async function simulateJitoBundle(umi, txs) {
             throw new Error(res.error.message);
         }
         return res.value;
-    });
+    }, 2);
     const transactionResults = simulationResult.transactionResults;
     return transactionResults;
 }

package/dist/utils/solanaUtils.js

@@ -265,7 +265,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     const blockhash = await connection.getLatestBlockhash("confirmed");
     let cuLimit = undefined;
     if (txType !== "skip-simulation") {
-        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, assembleFinalTransaction(umi, tx, undefined, 1400000).setBlockhash(blockhash)), 3);
+        const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(umi, connection, assembleFinalTransaction(umi, tx, undefined, 1400000).setBlockhash(blockhash)), 2);
         cuLimit = Math.round(simulationResult.value.unitsConsumed * 1.15);
         (0, generalUtils_1.consoleLog)("Compute unit limit: ", cuLimit);
     }

package/local/txSandbox.ts

@@ -3,7 +3,9 @@ import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ClientTransactionsManager,
+  closeSolautoPosition,
   consoleLog,
+  deposit,
   getBatches,
   getClient,
   getPositionExBulk,
@@ -11,14 +13,19 @@ import {
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
   rebalance,
+  RETARDIO,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
+  toBaseUnit,
   TransactionItem,
+  USDC,
+  withdraw,
 } from "../src";
 import { getSecretKey } from "./shared";
 
@@ -34,7 +41,7 @@ let [, umi] = getSolanaRpcConnection(
 
 const signer = createSignerFromKeypair(
   umi,
-  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
 );
 
 export async function main() {
@@ -47,20 +54,52 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+    positionId: 3,
+    // authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
+    // lpPoolAccount: new PublicKey(
+    //   "EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"
+    // ),
+    // supplyMint: new PublicKey(USDC),
+    // debtMint: new PublicKey(RETARDIO),
   });
 
-  const transactionItems = [rebalance(client)];
+  await client.pos.refreshPositionState();
+
+  // const transactionItems = [
+  //   openSolautoPosition(client, {
+  //     boostGap: 100,
+  //     boostToBps: client.pos.maxBoostToBps,
+  //     repayGap: 100,
+  //     repayToBps: client.pos.maxRepayToBps,
+  //   }),
+  // ];
+  const transactionItems = [
+    // openSolautoPosition(client, {
+    //   boostGap: 100,
+    //   boostToBps: client.pos.maxBoostToBps,
+    //   repayGap: 100,
+    //   repayToBps: client.pos.maxRepayToBps,
+    // }),
+    deposit(client, toBaseUnit(5, client.pos.supplyMintInfo.decimals)),
+    rebalance(client, client.pos.maxBoostToBps),
+    // withdraw(client, "All"),
+    // closeSolautoPosition(client)
+    // new TransactionItem(
+    //   async () => ({ tx: client.refreshIx() }),
+    //   `refresh`,
+    //   true
+    // ),
+  ];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,
     txRunType: payForTransaction ? "normal" : "only-simulate",
     priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 5 },
+    retryConfig: { totalRetries: 0 },
+    // atomically: false,
   });
   const statuses = await txManager.send(transactionItems);
   consoleLog(statuses);
@@ -105,7 +144,7 @@ async function refreshAll() {
       txHandler: client!,
       txRunType: payForTransaction ? "normal" : "only-simulate",
       priorityFeeSetting: PriorityFeeSetting.Default,
-      retryConfig: { totalRetries: 5 },
+      retryConfig: { totalRetries: 2 },
     });
     const statuses = await txManager.send(batch);
     consoleLog(statuses);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.699",
+  "version": "1.0.700",
   "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

@@ -47,12 +47,22 @@ export class RebalanceSwapManager {
       ? this.client.pos.state.supply
       : this.client.pos.state.debt;
 
-    // const supplyPrice = this.client.pos.supplyPrice(this.priceType)!;
-    // const debtPrice = this.client.pos.debtPrice(this.priceType)!;
-    // const inputPrice = this.isBoost() ? debtPrice : supplyPrice;
-    // const outputPrice = this.isBoost() ? supplyPrice : debtPrice;
-    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;
 
     let inputAmount = toBaseUnit(
       this.usdToSwap() / inputPrice!,
@@ -63,31 +73,42 @@ export class RebalanceSwapManager {
       inputAmount,
       input,
       inputPrice,
+      biasedInputPrice,
       output,
       outputPrice,
+      biasedOutputPrice,
     };
   }
 
-  private postRebalanceLiqUtilizationRateBps(swapOutputAmount?: bigint) {
+  private postRebalanceLiqUtilizationRateBps(
+    swapOutputAmount?: bigint,
+    swapInputAmount?: bigint
+  ) {
     let supplyUsd = this.client.pos.supplyUsd(this.priceType);
     let debtUsd = this.client.pos.debtUsd(this.priceType);
     // TODO: add token balance change
 
-    const { output, outputPrice } = this.swapDetails();
+    const { input, biasedInputPrice, output, biasedOutputPrice } =
+      this.swapDetails();
+
+    const swapInputUsd = swapInputAmount
+      ? fromBaseUnit(
+          swapInputAmount,
+          tokenInfo(toWeb3JsPublicKey(input.mint)).decimals
+        ) * biasedInputPrice
+      : this.usdToSwap();
 
     const swapOutputUsd = swapOutputAmount
       ? fromBaseUnit(
           swapOutputAmount,
           tokenInfo(toWeb3JsPublicKey(output.mint)).decimals
-        ) * outputPrice
+        ) * biasedOutputPrice
       : this.usdToSwap();
 
     supplyUsd = this.isBoost()
       ? supplyUsd + swapOutputUsd
-      : supplyUsd - this.usdToSwap();
-    debtUsd = this.isBoost()
-      ? debtUsd + this.usdToSwap()
-      : debtUsd - swapOutputUsd;
+      : supplyUsd - swapInputUsd;
+    debtUsd = this.isBoost() ? debtUsd + swapInputUsd : debtUsd - swapOutputUsd;
 
     return getLiqUtilzationRateBps(
       supplyUsd,
@@ -107,13 +128,14 @@ export class RebalanceSwapManager {
     let swapQuote: QuoteResponse;
     let insufficient: boolean = false;
 
-    for (let i = 0; i < 10; i++) {
+    for (let i = 0; i < 20; i++) {
       consoleLog("Finding sufficient quote...");
       swapQuote = await this.jupSwapManager.getQuote(swapInput);
 
       const outputAmount = parseInt(swapQuote.outAmount);
       const postRebalanceRate = this.postRebalanceLiqUtilizationRateBps(
-        BigInt(outputAmount)
+        BigInt(outputAmount),
+        BigInt(parseInt(swapQuote.inAmount))
       );
       insufficient = criteria.minOutputAmount
         ? outputAmount < Number(criteria.minOutputAmount)
@@ -121,9 +143,15 @@ export class RebalanceSwapManager {
           ? postRebalanceRate < criteria.minLiqUtilizationRateBps
           : postRebalanceRate > criteria.maxLiqUtilizationRateBps!;
 
+      consoleLog(postRebalanceRate, criteria.maxLiqUtilizationRateBps);
       if (insufficient) {
         consoleLog("Insufficient swap quote:", swapQuote);
-        swapInput.amount = this.bigIntWithIncrement(swapInput.amount, 0.01);
+
+        const increment = 0.01 + i * 0.005;
+        swapInput.amount = this.bigIntWithIncrement(
+          swapInput.amount,
+          this.isBoost() ? increment * -1 : increment
+        );
       } else {
         break;
       }
@@ -183,11 +211,11 @@ export class RebalanceSwapManager {
     };
     consoleLog("Swap input:", swapInput);
 
-    if (exactIn && (rebalanceToZero || this.values.repayingCloseToMaxLtv)) {
+    if (exactIn) {
       this.swapQuote = await this.findSufficientQuote(swapInput, {
         minOutputAmount: rebalanceToZero ? outputAmount : undefined,
-        maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
-          ? this.client.pos.maxRepayToBps - 15
+        maxLiqUtilizationRateBps: !rebalanceToZero
+          ? this.client.pos.maxBoostToBps
           : undefined,
       });
     }

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -8,13 +8,16 @@ import {
   TransactionItemInputs,
 } from "../../types";
 import {
+  bytesToI80F48,
   consoleLog,
   fromBaseUnit,
   fromBps,
+  getLiqUtilzationRateBps,
   getMaxLiqUtilizationRateBps,
   getTokenAccount,
   hasFirstRebalance,
   hasLastRebalance,
+  isMarginfiPosition,
   safeGetPrice,
   tokenInfo,
 } from "../../utils";
@@ -346,6 +349,12 @@ export class RebalanceTxBuilder {
       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);
+      consoleLog("Weighted values", supply, debt);
+    }
+
     const firstRebalance = this.client.rebalanceIx(
       RebalanceStep.PreSwap,
       rebalanceDetails

package/src/services/solauto/solautoClient.ts

@@ -437,7 +437,7 @@ export abstract class SolautoClient extends ReferralStateManager {
     });
   }
 
-  abstract refreshIx(priceType: PriceType): TransactionBuilder;
+  abstract refreshIx(priceType?: PriceType): TransactionBuilder;
 
   protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder {
     let tx = transactionBuilder();

package/src/services/solauto/solautoMarginfiClient.ts

@@ -230,7 +230,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     });
   }
 
-  refreshIx(priceType: PriceType): TransactionBuilder {
+  refreshIx(priceType?: PriceType): TransactionBuilder {
     return marginfiRefreshData(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(this.mfiAccounts.program),
@@ -241,7 +241,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       debtPriceOracle: publicKey(this.debtPriceOracle),
       solautoPosition: publicKey(this.pos.publicKey),
-      priceType,
+      priceType: priceType ?? PriceType.Realtime,
     });
   }
 

package/src/services/swap/jupSwapManager.ts

@@ -69,7 +69,7 @@ export class JupSwapManager {
               ? "ExactIn"
               : undefined,
           slippageBps,
-          maxAccounts: !data.exactOut ? 15 + attemptNum * 5 : undefined,
+          maxAccounts: !data.exactOut ? (memeSwap ? 25 : 15) + attemptNum * 5 : undefined,
         }),
       4,
       150

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -21,8 +21,8 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   lendingPlatform = LendingPlatform.Marginfi;
   maxLtvPriceType = PriceType.Ema;
 
-  private supplyBank: Bank | null = null;
-  private debtBank: Bank | null = null;
+  public supplyBank: Bank | null = null;
+  public debtBank: Bank | null = null;
 
   supplyPrice(priceType?: PriceType): number | undefined {
     return this._supplyPrice ?? safeGetPrice(this.supplyMint, priceType, PriceBias.Low);

package/src/utils/jitoUtils.ts

@@ -121,7 +121,7 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
     }
 
     return res.value;
-  });
+  }, 2);
 
   const transactionResults =
     simulationResult.transactionResults as SimulatedTransactionResponse[];

package/src/utils/solanaUtils.ts

@@ -462,7 +462,7 @@ export async function sendSingleOptimizedTransaction(
             blockhash
           )
         ),
-      3
+      2
     );
     cuLimit = Math.round(simulationResult.value.unitsConsumed! * 1.15);
     consoleLog("Compute unit limit: ", cuLimit);