@haven-fi/solauto-sdk 1.0.457 → 1.0.459

package/dist/transactions/transactionUtils.d.ts

@@ -1,11 +1,12 @@
 import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../clients/solautoClient";
+import { RebalanceValues } from "../utils/solauto/rebalanceUtils";
 import { ReferralStateManager } from "../clients";
 import { TransactionItemInputs } 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 requiresRefreshBeforeRebalance(client: SolautoClient): Promise<boolean>;
+export declare function requiresRefreshBeforeRebalance(client: SolautoClient, values: RebalanceValues): Promise<boolean>;
 export declare function buildSolautoRebalanceTransaction(client: SolautoClient, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<TransactionItemInputs | undefined>;
 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): {

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAoBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA4LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAqDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAoI5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EAiG/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAqBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAOzD,OAAO,EAIL,eAAe,EAChB,MAAM,iCAAiC,CAAC;AA2BzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,oBAuExB;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAqI5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EAiG/B"}

package/dist/transactions/transactionUtils.js

@@ -329,7 +329,20 @@ async function getTransactionChores(client, tx) {
     choresAfter = choresAfter.add(transactionChoresAfter(client, solautoActions, client.livePositionUpdates.cancellingDca));
     return [choresBefore, choresAfter];
 }
-async function requiresRefreshBeforeRebalance(client) {
+async function requiresRefreshBeforeRebalance(client, values) {
+    // REMOVE ME
+    const state = client.solautoPositionState;
+    const settings = client.solautoPositionSettings();
+    const supplyMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint);
+    if ((supplyMint.equals(new web3_js_1.PublicKey(constants_1.JUP)) ||
+        supplyMint.equals(new web3_js_1.PublicKey(constants_1.BONK))) &&
+        (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint).equals(new web3_js_1.PublicKey(constants_1.USDC)) &&
+        settings &&
+        settings.boostToBps ===
+            (0, numberUtils_1.maxBoostToBps)(state.maxLtvBps, state.liqThresholdBps) &&
+        values.targetRateBps === 6500) {
+        return true;
+    }
     const neverRefreshedBefore = client.solautoPositionData &&
         client.solautoPositionData.state.supply.amountCanBeUsed.baseUnit ===
             BigInt(0) &&
@@ -377,7 +390,8 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
     const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, jupQuote);
     let tx = (0, umi_1.transactionBuilder)();
-    if (await requiresRefreshBeforeRebalance(client)) {
+    // REVERT ME
+    if (await requiresRefreshBeforeRebalance(client, values)) {
         tx = tx.add(client.refresh());
     }
     if (flashLoan) {

package/dist/utils/solauto/rebalanceUtils.d.ts

@@ -13,6 +13,7 @@ export interface RebalanceValues {
     rebalanceAction: RebalanceAction;
     rebalanceDirection: RebalanceDirection;
     feesUsd: number;
+    targetRateBps: number;
 }
 export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): RebalanceValues;
 export declare function rebalanceRequiresFlashLoan(client: SolautoClient, values: RebalanceValues): {

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAwDjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAqDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2DhB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAcjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAoI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CA2EjB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe;;;EAsDxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmC9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2DhB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -4,6 +4,7 @@ exports.getRebalanceValues = getRebalanceValues;
 exports.rebalanceRequiresFlashLoan = rebalanceRequiresFlashLoan;
 exports.getFlashLoanDetails = getFlashLoanDetails;
 exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;
+const web3_js_1 = require("@solana/web3.js");
 const generated_1 = require("../../generated");
 const generalUtils_1 = require("./generalUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -11,6 +12,7 @@ const generalUtils_2 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
 const generalAccounts_1 = require("../../constants/generalAccounts");
 const priceUtils_1 = require("../priceUtils");
+const constants_1 = require("../../constants");
 function getAdditionalAmountToDcaIn(dca) {
     if (dca.dcaInBaseUnit === BigInt(0)) {
         return 0;
@@ -82,7 +84,17 @@ function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, target
     }
 }
 function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps) {
-    const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
+    let { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
+    // REVERT ME AND GET TO THE ROOT OF THIS ISSUE
+    if (((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint).equals(new web3_js_1.PublicKey(constants_1.JUP)) ||
+        (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint).equals(new web3_js_1.PublicKey(constants_1.BONK))) &&
+        (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint).equals(new web3_js_1.PublicKey(constants_1.USDC)) &&
+        settings &&
+        settings.boostToBps ===
+            (0, numberUtils_1.maxBoostToBps)(state.maxLtvBps, state.liqThresholdBps) &&
+        targetRateBps === settings.boostToBps) {
+        targetRateBps = 6500;
+    }
     const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
         (dca?.tokenType === generated_1.TokenType.Debt ? debtPrice : supplyPrice);
     const rebalanceDirection = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps <= targetRateBps
@@ -93,6 +105,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         amountUsdToDcaIn;
     const debtUsd = (0, numberUtils_1.fromBaseUnit)(state.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
     let debtAdjustmentUsd = (0, numberUtils_1.getDebtAdjustmentUsd)(state.liqThresholdBps, supplyUsd, debtUsd, targetRateBps, adjustmentFeeBps);
+    (0, generalUtils_2.consoleLog)("Target rate:", targetRateBps, (0, numberUtils_1.maxBoostToBps)(state.maxLtvBps, state.liqThresholdBps));
     const maxRepayTo = (0, numberUtils_1.maxRepayToBps)(state.maxLtvBps, state.liqThresholdBps);
     return {
         debtAdjustmentUsd,
@@ -107,6 +120,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
                 : "repay",
         rebalanceDirection,
         feesUsd: Math.abs(debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps)),
+        targetRateBps,
     };
 }
 function rebalanceRequiresFlashLoan(client, values) {
@@ -125,9 +139,10 @@ function rebalanceRequiresFlashLoan(client, values) {
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
     const maxLiqUtilizationRateBps = (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.02);
     const requiresFlashLoan = supplyUsd <= 0 || tempLiqUtilizationRateBps > maxLiqUtilizationRateBps;
-    const useDebtLiquidity = Math.abs(values.debtAdjustmentUsd) * 0.9 >
-        (0, numberUtils_1.fromBaseUnit)(client.supplyLiquidityAvailable(), generalAccounts_1.USD_DECIMALS) *
-            ((0, priceUtils_1.safeGetPrice)(client.supplyMint) ?? 0);
+    const useDebtLiquidity = values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
+        Math.abs(values.debtAdjustmentUsd) * 0.9 >
+            (0, numberUtils_1.fromBaseUnit)(client.supplyLiquidityAvailable(), generalAccounts_1.USD_DECIMALS) *
+                ((0, priceUtils_1.safeGetPrice)(client.supplyMint) ?? 0);
     (0, generalUtils_2.consoleLog)("Requires flash loan:", requiresFlashLoan);
     (0, generalUtils_2.consoleLog)("Use debt liquidity:", useDebtLiquidity);
     (0, generalUtils_2.consoleLog)("Intermediary liq utilization rate:", tempLiqUtilizationRateBps, `$${supplyUsd}`, `$${debtUsd}`, "Max:", maxLiqUtilizationRateBps);

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -19,6 +19,7 @@ import {
   RebalanceDirection,
   SolautoAction,
   SolautoRebalanceType,
+  SolautoSettingsParameters,
   TokenType,
   convertReferralFees,
   createSolautoProgram,
@@ -39,6 +40,7 @@ import {
   getFlashLoanDetails,
   getJupSwapRebalanceDetails,
   getRebalanceValues,
+  RebalanceValues,
 } from "../utils/solauto/rebalanceUtils";
 import {
   consoleLog,
@@ -49,6 +51,7 @@ import {
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
 import {
   getMaxLiqUtilizationRateBps,
+  maxBoostToBps,
   uint8ArrayToBigInt,
 } from "../utils/numberUtils";
 import {
@@ -71,10 +74,11 @@ import {
   getJupiterErrorFromCode,
   JUPITER_PROGRAM_ID,
 } from "../jupiter-sdk";
-import { PRICES } from "../constants";
+import { BONK, JUP, PRICES, USDC } from "../constants";
 import { TransactionItemInputs } from "../types";
 import { safeGetPrice } from "../utils";
 import { BundleSimulationError } from "../types/transactions";
+import { getPackedSettings } from "http2";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -598,7 +602,27 @@ export async function getTransactionChores(
   return [choresBefore, choresAfter];
 }
 
-export async function requiresRefreshBeforeRebalance(client: SolautoClient) {
+export async function requiresRefreshBeforeRebalance(
+  client: SolautoClient,
+  values: RebalanceValues
+) {
+  // REMOVE ME
+  const state = client.solautoPositionState!;
+  const settings = client.solautoPositionSettings();
+
+  const supplyMint = toWeb3JsPublicKey(state.supply.mint);
+  if (
+    (supplyMint.equals(new PublicKey(JUP)) ||
+      supplyMint.equals(new PublicKey(BONK))) &&
+    toWeb3JsPublicKey(state.debt.mint).equals(new PublicKey(USDC)) &&
+    settings &&
+    settings.boostToBps ===
+      maxBoostToBps(state.maxLtvBps, state.liqThresholdBps) &&
+    values.targetRateBps === 6500
+  ) {
+    return true;
+  }
+
   const neverRefreshedBefore =
     client.solautoPositionData &&
     client.solautoPositionData.state.supply.amountCanBeUsed.baseUnit ===
@@ -707,7 +731,8 @@ export async function buildSolautoRebalanceTransaction(
 
   let tx = transactionBuilder();
 
-  if (await requiresRefreshBeforeRebalance(client)) {
+  // REVERT ME
+  if (await requiresRefreshBeforeRebalance(client, values)) {
     tx = tx.add(client.refresh());
   }
 

package/src/utils/solauto/rebalanceUtils.ts

@@ -24,13 +24,14 @@ import {
   getLiqUtilzationRateBps,
   getMaxLiqUtilizationRateBps,
   getSolautoFeesBps,
+  maxBoostToBps,
   maxRepayToBps,
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
 import { RebalanceAction } from "../../types";
 import { safeGetPrice } from "../priceUtils";
-import { TOKEN_INFO } from "../../constants";
+import { BONK, JUP, TOKEN_INFO, USDC } from "../../constants";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.dcaInBaseUnit === BigInt(0)) {
@@ -169,6 +170,7 @@ export interface RebalanceValues {
   rebalanceAction: RebalanceAction;
   rebalanceDirection: RebalanceDirection;
   feesUsd: number;
+  targetRateBps: number;
 }
 
 export function getRebalanceValues(
@@ -180,7 +182,7 @@ export function getRebalanceValues(
   debtPrice: number,
   targetLiqUtilizationRateBps?: number
 ): RebalanceValues {
-  const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(
+  let { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(
     state,
     settings,
     dca,
@@ -188,6 +190,19 @@ export function getRebalanceValues(
     targetLiqUtilizationRateBps
   );
 
+  // REVERT ME AND GET TO THE ROOT OF THIS ISSUE
+  if (
+    (toWeb3JsPublicKey(state.supply.mint).equals(new PublicKey(JUP)) ||
+      toWeb3JsPublicKey(state.supply.mint).equals(new PublicKey(BONK))) &&
+    toWeb3JsPublicKey(state.debt.mint).equals(new PublicKey(USDC)) &&
+    settings &&
+    settings.boostToBps ===
+      maxBoostToBps(state.maxLtvBps, state.liqThresholdBps) &&
+    targetRateBps === settings.boostToBps
+  ) {
+    targetRateBps = 6500;
+  }
+
   const amountUsdToDcaIn =
     fromBaseUnit(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
     (dca?.tokenType === TokenType.Debt ? debtPrice : supplyPrice);
@@ -218,6 +233,11 @@ export function getRebalanceValues(
     adjustmentFeeBps
   );
 
+  consoleLog(
+    "Target rate:",
+    targetRateBps,
+    maxBoostToBps(state.maxLtvBps, state.liqThresholdBps)
+  );
   const maxRepayTo = maxRepayToBps(state.maxLtvBps, state.liqThresholdBps);
   return {
     debtAdjustmentUsd,
@@ -234,6 +254,7 @@ export function getRebalanceValues(
           : "repay",
     rebalanceDirection,
     feesUsd: Math.abs(debtAdjustmentUsd * fromBps(adjustmentFeeBps)),
+    targetRateBps,
   };
 }
 
@@ -276,9 +297,10 @@ export function rebalanceRequiresFlashLoan(
     supplyUsd <= 0 || tempLiqUtilizationRateBps > maxLiqUtilizationRateBps;
 
   const useDebtLiquidity =
+    values.rebalanceDirection === RebalanceDirection.Boost ||
     Math.abs(values.debtAdjustmentUsd) * 0.9 >
-    fromBaseUnit(client.supplyLiquidityAvailable(), USD_DECIMALS) *
-      (safeGetPrice(client.supplyMint) ?? 0);
+      fromBaseUnit(client.supplyLiquidityAvailable(), USD_DECIMALS) *
+        (safeGetPrice(client.supplyMint) ?? 0);
 
   consoleLog("Requires flash loan:", requiresFlashLoan);
   consoleLog("Use debt liquidity:", useDebtLiquidity);

package/tests/transactions/solautoMarginfi.ts

@@ -1,9 +1,5 @@
 import { describe, it } from "mocha";
-import {
-  none,
-  publicKey,
-  some,
-} from "@metaplex-foundation/umi";
+import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
@@ -13,6 +9,9 @@ import {
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
 import {
+  bytesToI80F48,
+  getLiqUtilzationRateBps,
+  getMaxLiqUtilizationRateBps,
   maxBoostToBps,
   maxRepayFromBps,
   maxRepayToBps,
@@ -25,24 +24,39 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import {
+  DEFAULT_MARGINFI_GROUP,
+  MARGINFI_ACCOUNTS,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   USDC,
+  USDT,
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
+  getMarginfiAccountPositionState,
   getSolautoManagedPositions,
+  retryWithExponentialBackoff,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
-import { buildIronforgeApiUrl } from "../../dist";
+import { buildIronforgeApiUrl, fetchSolautoPosition, fetchTokenPrices } from "../../dist";
+import { safeFetchBank } from "../../src/marginfi-sdk";
+
+export function getFlooredTimestampByMinute(
+  unixSeconds: number,
+  intervalInMinutes: number = 1
+): number {
+  const unixTime = Math.floor(new Date(unixSeconds * 1000).getTime() / 1000);
+  const interval = intervalInMinutes * 60;
+  return Math.floor(unixTime / interval) * interval;
+}
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
   const testProgram = false;
-  const positionId = 1;
+  const positionId = 3;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -58,7 +72,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz"),
+      authority: new PublicKey("7GMmfZdCgJSCawA7roGiGgvueU3XoEHQXUtiCnuDYUde"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -68,7 +82,22 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
-    // console.log(await getSolautoManagedPositions(client.umi));
+    // console.log(await client.getFreshPositionState());
+
+    // const debtBank = await safeFetchBank(
+    //   client.umi,
+    //   publicKey(MARGINFI_ACCOUNTS[DEFAULT_MARGINFI_GROUP][USDC].bank)
+    // );
+    // const state = await getMarginfiAccountPositionState(client.umi, {
+    //   pk: new PublicKey("85YaXXB1uyDMLYf4ob6jfV1kr29muVNm7mpmM8qjbVq6"),
+    // });
+    // console.log(state);
+    // console.log(maxBoostToBps(state.maxLtvBps, state.liqThresholdBps));
+    // console.log(
+    //   getMaxLiqUtilizationRateBps(state.maxLtvBps, state.liqThresholdBps, 0)
+    // );
+    // console.log(getLiqUtilzationRateBps(18.78, 7.47, state.liqThresholdBps));
+    // return;
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
@@ -86,6 +115,15 @@ describe("Solauto Marginfi tests", async () => {
     //   targetBoostToBps: none(),
     // };
 
+    const settingParams: SolautoSettingsParametersInpArgs = {
+      boostToBps: client.solautoPositionSettings().boostToBps - 150,
+      boostGap: 50,
+      repayToBps: client.solautoPositionSettings().repayToBps - 150,
+      repayGap: 50,
+      automation: none(),
+      targetBoostToBps: none(),
+    };
+
     // if (client.solautoPositionData === null) {
     //   transactionItems.push(
     //     new TransactionItem(async () => {
@@ -131,11 +169,18 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 4000, attemptNum),
         "rebalance"
       )
     );
 
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async () => ({ tx: client.refresh() }),
+    //     "refresh"
+    //   )
+    // );
+
     // transactionItems.push(
     //   new TransactionItem(
     //     async (attemptNum) =>