@haven-fi/solauto-sdk 1.0.501 → 1.0.503

package/dist/constants/solautoConstants.d.ts

@@ -15,5 +15,4 @@ export declare const PRICES: {
 export declare const SOLAUTO_LUT = "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
 export declare const STANDARD_LUT_ACCOUNTS: string[];
 export declare const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
-export declare const BROKEN_TOKENS: string[];
 //# sourceMappingURL=solautoConstants.d.ts.map

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAE3B,eAAO,MAAM,iBAAiB,0CAA0C,CAAC;AAEzE,eAAO,MAAM,aAAa,UAOzB,CAAA"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAE3B,eAAO,MAAM,iBAAiB,0CAA0C,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BROKEN_TOKENS = exports.JITO_BLOCK_ENGINE = exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.BASIS_POINTS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
+exports.JITO_BLOCK_ENGINE = exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.BASIS_POINTS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const generalAccounts_1 = require("./generalAccounts");
 const jupiter_sdk_1 = require("../jupiter-sdk");
-const tokenConstants_1 = require("./tokenConstants");
 exports.SOLAUTO_PROD_PROGRAM = new web3_js_1.PublicKey("AutoyKBRaHSBHy9RsmXCZMy6nNFAg5FYijrvZyQcNLV");
 exports.SOLAUTO_TEST_PROGRAM = new web3_js_1.PublicKey("TesTjfQ6TbXv96Tv6fqr95XTZ1LYPxtkafmShN9PjBp");
 globalThis.LOCAL_TEST = false;
@@ -30,11 +29,3 @@ exports.STANDARD_LUT_ACCOUNTS = [
     jupiter_sdk_1.JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
 exports.JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
-exports.BROKEN_TOKENS = [
-    tokenConstants_1.JUP,
-    tokenConstants_1.JLP,
-    tokenConstants_1.WETH,
-    tokenConstants_1.HNT,
-    tokenConstants_1.JTO,
-    tokenConstants_1.PYTH
-];

package/dist/transactions/transactionUtils.d.ts

@@ -1,12 +1,11 @@
 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, values: RebalanceValues): Promise<boolean>;
+export declare function requiresRefreshBeforeRebalance(client: SolautoClient): 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;AAOzD,OAAO,EAIL,eAAe,EAChB,MAAM,iCAAiC,CAAC;AA0BzC,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,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,oBAqDlG;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;;;;EAoG/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;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;;;;EAoG/B"}

package/dist/transactions/transactionUtils.js

@@ -329,7 +329,7 @@ async function getTransactionChores(client, tx) {
     choresAfter = choresAfter.add(transactionChoresAfter(client, solautoActions, client.livePositionUpdates.cancellingDca));
     return [choresBefore, choresAfter];
 }
-async function requiresRefreshBeforeRebalance(client, values) {
+async function requiresRefreshBeforeRebalance(client) {
     const neverRefreshedBefore = client.solautoPositionData &&
         client.solautoPositionData.state.supply.amountCanBeUsed.baseUnit ===
             BigInt(0) &&
@@ -373,12 +373,11 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     }
     const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), supplyPrice, debtPrice, targetLiqUtilizationRateBps);
     client.log("Rebalance values: ", values);
-    const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
+    const swapDetails = await (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
     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)();
-    // REVERT ME
-    if (await requiresRefreshBeforeRebalance(client, values)) {
+    if (await requiresRefreshBeforeRebalance(client)) {
         tx = tx.add(client.refresh());
     }
     if (flashLoan) {

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAc7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,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,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAc7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,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,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}

package/dist/transactions/transactionsManager.js

@@ -271,7 +271,6 @@ class TransactionsManager {
         for (const item of items) {
             await item.initialize();
         }
-        // TODO: need better fix here
         const allAccounts = items.flatMap((item) => {
             return (item.tx
                 ?.getInstructions()
@@ -290,7 +289,6 @@ class TransactionsManager {
                 .stale;
             if (stale) {
                 this.txHandler.log("Requires oracle update...");
-                console.log(mint);
                 const swbTx = new TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(client.connection, client.signer, mint), this.updateOracleTxName);
                 await swbTx.initialize();
                 items.unshift(swbTx);

package/dist/utils/jupiterUtils.d.ts

@@ -10,6 +10,7 @@ export interface JupSwapDetails {
     exactOut?: boolean;
     exactIn?: boolean;
     addPadding?: boolean;
+    jupQuote?: QuoteResponse;
 }
 export interface JupSwapTransaction {
     jupQuote: QuoteResponse;

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAiI7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAwG7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}

package/dist/utils/jupiterUtils.js

@@ -25,13 +25,8 @@ function createTransactionInstruction(instruction) {
 async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     const memecoinSwap = constants_1.TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
         constants_1.TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
-    const tokensWithLowAccounts = [constants_1.PYTH, constants_1.INF];
-    // TEMP REVERT ME
-    const useLowAccounts = tokensWithLowAccounts.find((x) => swapDetails.inputMint.equals(new web3_js_1.PublicKey(x))) ||
-        tokensWithLowAccounts.find((x) => swapDetails.outputMint.equals(new web3_js_1.PublicKey(x)));
-    let quoteResponse;
-    try {
-        quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
+    const quoteResponse = swapDetails.jupQuote ??
+        (await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
             amount: Number(swapDetails.amount),
             inputMint: swapDetails.inputMint.toString(),
             outputMint: swapDetails.outputMint.toString(),
@@ -41,20 +36,8 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
                     ? "ExactIn"
                     : undefined,
             slippageBps: memecoinSwap ? 500 : 200,
-            maxAccounts: !swapDetails.exactOut
-                ? useLowAccounts
-                    ? 15
-                    : 40
-                : undefined,
-        }), 4, 200);
-    }
-    catch (e) {
-        if (swapDetails.exactOut) {
-            // Failed to find exact out route, try exact in
-            return await getJupSwapTransaction(signer, { ...swapDetails, exactIn: true }, attemptNum);
-        }
-        throw e;
-    }
+            maxAccounts: !swapDetails.exactOut ? 40 : undefined,
+        }), 4, 200));
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
         (1 + (swapDetails.slippageIncFactor ?? 0)));

package/dist/utils/priceUtils.d.ts

@@ -5,4 +5,8 @@ export declare function getPythPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getSwitchboardPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function getJupTokenPrices(mints: PublicKey[]): Promise<number[]>;
 export declare function safeGetPrice(mint: PublicKey | UmiPublicKey | undefined): number | undefined;
+export declare function getPriceImpact(inputMint: PublicKey, inputAmount: bigint, outputMint: PublicKey): Promise<{
+    priceImpact: number;
+    quote: import("@jup-ag/api").QuoteResponse;
+}>;
 //# sourceMappingURL=priceUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAcrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAQzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgDnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAQzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,SAAS;;;GAoBtB"}

package/dist/utils/priceUtils.js

@@ -28,6 +28,7 @@ exports.getPythPrices = getPythPrices;
 exports.getSwitchboardPrices = getSwitchboardPrices;
 exports.getJupTokenPrices = getJupTokenPrices;
 exports.safeGetPrice = safeGetPrice;
+exports.getPriceImpact = getPriceImpact;
 const pythConstants_1 = require("../constants/pythConstants");
 const numberUtils_1 = require("./numberUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
@@ -35,6 +36,7 @@ const switchboardConstants_1 = require("../constants/switchboardConstants");
 const generalUtils_1 = require("./generalUtils");
 const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
 const jupiterUtils_1 = require("./jupiterUtils");
+const api_1 = require("@jup-ag/api");
 async function fetchTokenPrices(mints) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
@@ -128,3 +130,16 @@ function safeGetPrice(mint) {
     }
     return undefined;
 }
+async function getPriceImpact(inputMint, inputAmount, outputMint) {
+    const jupApi = (0, api_1.createJupiterApiClient)();
+    const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
+        amount: Number(inputAmount),
+        inputMint: inputMint.toString(),
+        outputMint: outputMint.toString(),
+        swapMode: "ExactIn",
+    }), 4, 200);
+    return {
+        priceImpact: parseFloat(quoteResponse.priceImpactPct),
+        quote: quoteResponse,
+    };
+}

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

@@ -13,7 +13,6 @@ 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): {
@@ -26,5 +25,5 @@ export interface FlashLoanDetails {
     useDebtLiquidity: boolean;
 }
 export declare function getFlashLoanDetails(client: SolautoClient, values: RebalanceValues, jupQuote: QuoteResponse): FlashLoanDetails | undefined;
-export declare function getJupSwapRebalanceDetails(client: SolautoClient, values: RebalanceValues, targetLiqUtilizationRateBps?: number, attemptNum?: number): JupSwapDetails;
+export declare function getJupSwapRebalanceDetails(client: SolautoClient, values: RebalanceValues, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<JupSwapDetails>;
 //# sourceMappingURL=rebalanceUtils.d.ts.map

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;AAcjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA4I9C,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,CA6EjB;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,CAgC9B;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;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;;;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,CAgC9B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,CA2EzB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -4,7 +4,6 @@ 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");
@@ -12,7 +11,6 @@ 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;
@@ -84,18 +82,7 @@ function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, target
     }
 }
 function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps) {
-    let { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
-    // REVERT ME AND GET TO THE ROOT OF THIS ISSUE
-    const supplyMint = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint);
-    if (constants_1.BROKEN_TOKENS.includes(supplyMint.toString()) &&
-        ((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint).equals(new web3_js_1.PublicKey(constants_1.USDC)) ||
-            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint).equals(new web3_js_1.PublicKey(constants_1.USDT))) &&
-        settings &&
-        settings.boostToBps ===
-            (0, numberUtils_1.maxBoostToBps)(state.maxLtvBps, state.liqThresholdBps) &&
-        targetRateBps === settings.boostToBps) {
-        targetRateBps = 6500;
-    }
+    const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
     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
@@ -106,7 +93,6 @@ 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,
@@ -121,7 +107,6 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
                 : "repay",
         rebalanceDirection,
         feesUsd: Math.abs(debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps)),
-        targetRateBps,
     };
 }
 function rebalanceRequiresFlashLoan(client, values) {
@@ -173,7 +158,7 @@ function getFlashLoanDetails(client, values, jupQuote) {
         }
         : undefined;
 }
-function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps, attemptNum) {
+async function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps, attemptNum) {
     const input = values.rebalanceDirection === generated_1.RebalanceDirection.Boost
         ? client.solautoPositionState.debt
         : client.solautoPositionState.supply;
@@ -192,9 +177,20 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const repaying = values.rebalanceDirection === generated_1.RebalanceDirection.Repay;
     const { requiresFlashLoan, useDebtLiquidity } = rebalanceRequiresFlashLoan(client, values);
     const flashLoanRepayFromDebt = repaying && requiresFlashLoan && useDebtLiquidity;
-    const exactOut = targetLiqUtilizationRateBps === 0 ||
-        flashLoanRepayFromDebt;
+    const exactOut = 
+    // targetLiqUtilizationRateBps === 0 ||
+    // values.repayingCloseToMaxLtv ||
+    flashLoanRepayFromDebt;
     const exactIn = !exactOut;
+    let jupQuote = undefined;
+    if (targetLiqUtilizationRateBps === 0) {
+        let priceImpact = 0;
+        do {
+            const res = await (0, priceUtils_1.getPriceImpact)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint), inputAmount + BigInt(Math.round(Number(inputAmount) * priceImpact)), (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint));
+            priceImpact = res.priceImpact;
+            jupQuote = res.quote;
+        } while (parseInt(jupQuote.outAmount) < outputAmount);
+    }
     const addPadding = exactOut;
     return {
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
@@ -207,5 +203,6 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         exactIn,
         exactOut,
         addPadding,
+        jupQuote,
     };
 }

package/package.json

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

package/src/constants/solautoConstants.ts

@@ -11,7 +11,6 @@ import {
 } from "@solana/spl-token";
 import { SOLAUTO_MANAGER } from "./generalAccounts";
 import { JUPITER_PROGRAM_ID } from "../jupiter-sdk";
-import { HNT, JLP, JTO, JUP, PYTH, WETH } from "./tokenConstants";
 
 export const SOLAUTO_PROD_PROGRAM = new PublicKey(
   "AutoyKBRaHSBHy9RsmXCZMy6nNFAg5FYijrvZyQcNLV"
@@ -46,13 +45,4 @@ export const STANDARD_LUT_ACCOUNTS = [
   JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
 
-export const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
-
-export const BROKEN_TOKENS = [
-  JUP,
-  JLP,
-  WETH,
-  HNT,
-  JTO,
-  PYTH
-]
+export const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";

package/src/transactions/transactionUtils.ts

@@ -39,7 +39,6 @@ import {
   getFlashLoanDetails,
   getJupSwapRebalanceDetails,
   getRebalanceValues,
-  RebalanceValues,
 } from "../utils/solauto/rebalanceUtils";
 import {
   consoleLog,
@@ -72,11 +71,10 @@ import {
   getJupiterErrorFromCode,
   JUPITER_PROGRAM_ID,
 } from "../jupiter-sdk";
-import { JUP, PRICES, USDC } from "../constants";
+import { PRICES } from "../constants";
 import { TransactionItemInputs } from "../types";
 import { safeGetPrice } from "../utils";
 import { BundleSimulationError } from "../types/transactions";
-import { getPackedSettings } from "http2";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -600,7 +598,7 @@ export async function getTransactionChores(
   return [choresBefore, choresAfter];
 }
 
-export async function requiresRefreshBeforeRebalance(client: SolautoClient, values: RebalanceValues) {
+export async function requiresRefreshBeforeRebalance(client: SolautoClient) {
   const neverRefreshedBefore =
     client.solautoPositionData &&
     client.solautoPositionData.state.supply.amountCanBeUsed.baseUnit ===
@@ -692,7 +690,7 @@ export async function buildSolautoRebalanceTransaction(
   );
   client.log("Rebalance values: ", values);
 
-  const swapDetails = getJupSwapRebalanceDetails(
+  const swapDetails = await getJupSwapRebalanceDetails(
     client,
     values,
     targetLiqUtilizationRateBps,
@@ -709,8 +707,7 @@ export async function buildSolautoRebalanceTransaction(
 
   let tx = transactionBuilder();
 
-  // REVERT ME
-  if (await requiresRefreshBeforeRebalance(client, values)) {
+  if (await requiresRefreshBeforeRebalance(client)) {
     tx = tx.add(client.refresh());
   }
 

package/src/transactions/transactionsManager.ts

@@ -435,7 +435,6 @@ export class TransactionsManager {
       await item.initialize();
     }
 
-    // TODO: need better fix here
     const allAccounts = items.flatMap((item) => {
       return (
         item.tx
@@ -466,7 +465,6 @@ export class TransactionsManager {
 
       if (stale) {
         this.txHandler.log("Requires oracle update...");
-        console.log(mint);
         const swbTx = new TransactionItem(
           async () =>
             buildSwbSubmitResponseTx(client.connection, client.signer, mint),

package/src/utils/jupiterUtils.ts

@@ -13,7 +13,7 @@ import {
 } from "@jup-ag/api";
 import { getTokenAccount } from "./accountUtils";
 import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
-import { INF, PYTH, TOKEN_INFO } from "../constants";
+import { TOKEN_INFO } from "../constants";
 
 const jupApi = createJupiterApiClient();
 
@@ -26,6 +26,7 @@ export interface JupSwapDetails {
   exactOut?: boolean;
   exactIn?: boolean;
   addPadding?: boolean;
+  jupQuote?: QuoteResponse;
 }
 
 function createTransactionInstruction(
@@ -60,19 +61,9 @@ export async function getJupSwapTransaction(
     TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
     TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
 
-  const tokensWithLowAccounts = [PYTH, INF];
-  // TEMP REVERT ME
-  const useLowAccounts =
-    tokensWithLowAccounts.find((x) =>
-      swapDetails.inputMint.equals(new PublicKey(x))
-    ) ||
-    tokensWithLowAccounts.find((x) =>
-      swapDetails.outputMint.equals(new PublicKey(x))
-    );
-
-  let quoteResponse: QuoteResponse;
-  try {
-    quoteResponse = await retryWithExponentialBackoff(
+  const quoteResponse =
+    swapDetails.jupQuote ??
+    (await retryWithExponentialBackoff(
       async () =>
         await jupApi.quoteGet({
           amount: Number(swapDetails.amount),
@@ -84,26 +75,11 @@ export async function getJupSwapTransaction(
               ? "ExactIn"
               : undefined,
           slippageBps: memecoinSwap ? 500 : 200,
-          maxAccounts: !swapDetails.exactOut
-            ? useLowAccounts
-              ? 15
-              : 40
-            : undefined,
+          maxAccounts: !swapDetails.exactOut ? 40 : undefined,
         }),
       4,
       200
-    );
-  } catch (e) {
-    if (swapDetails.exactOut) {
-      // Failed to find exact out route, try exact in
-      return await getJupSwapTransaction(
-        signer,
-        { ...swapDetails, exactIn: true },
-        attemptNum
-      );
-    }
-    throw e;
-  }
+    ));
 
   const priceImpactBps =
     Math.round(toBps(parseFloat(quoteResponse.priceImpactPct))) + 1;

package/src/utils/priceUtils.ts

@@ -1,17 +1,19 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
-import { fromBaseUnit, toBaseUnit } from "./numberUtils";
+import { fromBaseUnit, toBaseUnit, toBps } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
 import {
   consoleLog,
   currentUnixSeconds,
   retryWithExponentialBackoff,
+  tokenInfo,
   zip,
 } from "./generalUtils";
 import * as OnDemand from "@switchboard-xyz/on-demand";
 import { getJupPriceData } from "./jupiterUtils";
+import { createJupiterApiClient } from "@jup-ag/api";
 
 export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
@@ -164,3 +166,28 @@ export function safeGetPrice(
   }
   return undefined;
 }
+
+export async function getPriceImpact(
+  inputMint: PublicKey,
+  inputAmount: bigint,
+  outputMint: PublicKey
+) {
+  const jupApi = createJupiterApiClient();
+
+  const quoteResponse = await retryWithExponentialBackoff(
+    async () =>
+      await jupApi.quoteGet({
+        amount: Number(inputAmount),
+        inputMint: inputMint.toString(),
+        outputMint: outputMint.toString(),
+        swapMode: "ExactIn",
+      }),
+    4,
+    200
+  );
+
+  return {
+    priceImpact: parseFloat(quoteResponse.priceImpactPct),
+    quote: quoteResponse,
+  };
+}

package/src/utils/solauto/rebalanceUtils.ts

@@ -16,7 +16,7 @@ import {
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
-import { consoleLog, currentUnixSeconds, tokenInfo } from "../generalUtils";
+import { consoleLog, currentUnixSeconds } from "../generalUtils";
 import {
   fromBaseUnit,
   fromBps,
@@ -24,22 +24,13 @@ import {
   getLiqUtilzationRateBps,
   getMaxLiqUtilizationRateBps,
   getSolautoFeesBps,
-  maxBoostToBps,
   maxRepayToBps,
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
 import { RebalanceAction } from "../../types";
-import { safeGetPrice } from "../priceUtils";
-import {
-  BONK,
-  BROKEN_TOKENS,
-  JUP,
-  TOKEN_INFO,
-  USDC,
-  USDT,
-  WETH,
-} from "../../constants";
+import { getPriceImpact, safeGetPrice } from "../priceUtils";
+import { TOKEN_INFO } from "../../constants";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.dcaInBaseUnit === BigInt(0)) {
@@ -178,7 +169,6 @@ export interface RebalanceValues {
   rebalanceAction: RebalanceAction;
   rebalanceDirection: RebalanceDirection;
   feesUsd: number;
-  targetRateBps: number;
 }
 
 export function getRebalanceValues(
@@ -190,7 +180,7 @@ export function getRebalanceValues(
   debtPrice: number,
   targetLiqUtilizationRateBps?: number
 ): RebalanceValues {
-  let { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(
+  const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(
     state,
     settings,
     dca,
@@ -198,20 +188,6 @@ export function getRebalanceValues(
     targetLiqUtilizationRateBps
   );
 
-  // REVERT ME AND GET TO THE ROOT OF THIS ISSUE
-  const supplyMint = toWeb3JsPublicKey(state.supply.mint);
-  if (
-    BROKEN_TOKENS.includes(supplyMint.toString()) &&
-    (toWeb3JsPublicKey(state.debt.mint).equals(new PublicKey(USDC)) ||
-      toWeb3JsPublicKey(state.debt.mint).equals(new PublicKey(USDT))) &&
-    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);
@@ -242,12 +218,6 @@ export function getRebalanceValues(
     adjustmentFeeBps
   );
 
-  consoleLog(
-    "Target rate:",
-    targetRateBps,
-    maxBoostToBps(state.maxLtvBps, state.liqThresholdBps)
-  );
-
   const maxRepayTo = maxRepayToBps(state.maxLtvBps, state.liqThresholdBps);
   return {
     debtAdjustmentUsd,
@@ -264,7 +234,6 @@ export function getRebalanceValues(
           : "repay",
     rebalanceDirection,
     feesUsd: Math.abs(debtAdjustmentUsd * fromBps(adjustmentFeeBps)),
-    targetRateBps,
   };
 }
 
@@ -370,12 +339,12 @@ export function getFlashLoanDetails(
     : undefined;
 }
 
-export function getJupSwapRebalanceDetails(
+export async function getJupSwapRebalanceDetails(
   client: SolautoClient,
   values: RebalanceValues,
   targetLiqUtilizationRateBps?: number,
   attemptNum?: number
-): JupSwapDetails {
+): Promise<JupSwapDetails> {
   const input =
     values.rebalanceDirection === RebalanceDirection.Boost
       ? client.solautoPositionState!.debt
@@ -393,7 +362,6 @@ export function getJupSwapRebalanceDetails(
     usdToSwap / safeGetPrice(input.mint)!,
     input.decimals
   );
-
   const outputAmount =
     targetLiqUtilizationRateBps === 0
       ? output.amountUsed.baseUnit +
@@ -416,10 +384,26 @@ export function getJupSwapRebalanceDetails(
     repaying && requiresFlashLoan && useDebtLiquidity;
 
   const exactOut =
-    targetLiqUtilizationRateBps === 0 ||
+    // targetLiqUtilizationRateBps === 0 ||
+    // values.repayingCloseToMaxLtv ||
     flashLoanRepayFromDebt;
   const exactIn = !exactOut;
 
+  let jupQuote: QuoteResponse | undefined = undefined;
+  if (targetLiqUtilizationRateBps === 0) {
+    let priceImpact: number = 0;
+
+    do {
+      const res = await getPriceImpact(
+        toWeb3JsPublicKey(input.mint),
+        inputAmount + BigInt(Math.round(Number(inputAmount) * priceImpact)),
+        toWeb3JsPublicKey(output.mint)
+      );
+      priceImpact = res.priceImpact;
+      jupQuote = res.quote;
+    } while (parseInt(jupQuote.outAmount) < outputAmount);
+  }
+
   const addPadding = exactOut;
 
   return {
@@ -433,5 +417,6 @@ export function getJupSwapRebalanceDetails(
     exactIn,
     exactOut,
     addPadding,
+    jupQuote,
   };
 }

package/tests/transactions/solautoMarginfi.ts

@@ -3,16 +3,12 @@ import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
-  PositionType,
   safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
 import {
-  bytesToI80F48,
-  getLiqUtilzationRateBps,
-  getMaxLiqUtilizationRateBps,
   maxBoostToBps,
   maxRepayFromBps,
   maxRepayToBps,
@@ -25,20 +21,17 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import {
-  DEFAULT_MARGINFI_GROUP,
-  MARGINFI_ACCOUNTS,
+  INF,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   USDC,
-  USDT,
 } from "../../src/constants";
 import {
   buildHeliusApiUrl,
-  getAllPositionsByAuthority,
+  fetchTokenPrices,
+  getJupPriceData,
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
-  getSolautoPositionAccount,
-  retryWithExponentialBackoff,
 } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
 import { buildIronforgeApiUrl } from "../../dist";
@@ -63,26 +56,22 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
+    // await client.initialize({
+    //   signer,
+    //   positionId,
+    //   authority: new PublicKey("He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz"),
+    //   // new: true,
+    //   // marginfiAccount: new PublicKey(
+    //   //   ""
+    //   // ),
+    //   // marginfiGroup: new PublicKey(""),
+    //   // supplyMint: new PublicKey(""),
+    //   // debtMint: new PublicKey(USDC),
+    // });
+
     console.log(
-      getSolautoPositionAccount(
-        new PublicKey("9j53Z6bejUaAxJCEC64BbxozLPuvsuAFsr6iqWKKDvaw"),
-        1,
-        SOLAUTO_PROD_PROGRAM
-      )
+      JSON.stringify(await getJupPriceData([new PublicKey(INF)], true), null, 2)
     );
-    await client.initialize({
-      signer,
-      positionId,
-      authority: new PublicKey("9j53Z6bejUaAxJCEC64BbxozLPuvsuAFsr6iqWKKDvaw"),
-      // new: true,
-      // marginfiAccount: new PublicKey(
-      //   ""
-      // ),
-      // marginfiGroup: new PublicKey(""),
-      // supplyMint: new PublicKey(""),
-      // debtMint: new PublicKey(USDC),
-    });
-
     return;
 
     // console.log(
@@ -113,15 +102,6 @@ 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 () => {
@@ -164,48 +144,41 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
+    transactionItems.push(
+      new TransactionItem(
+        async (attemptNum) =>
+          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+        "rebalance"
+      )
+    );
+
     // transactionItems.push(
     //   new TransactionItem(
     //     async (attemptNum) =>
-    //       await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+    //       await buildSolautoRebalanceTransaction(client, settingParams.boostToBps, attemptNum),
     //     "rebalance"
     //   )
     // );
 
     // transactionItems.push(
     //   new TransactionItem(
-    //     async () => ({ tx: client.refresh() }),
-    //     "refresh"
+    //     async () => ({
+    //       tx: client.protocolInteraction(
+    //         solautoAction("Withdraw", [{ __kind: "All" }])
+    //       ),
+    //     }),
+    //     "withdraw"
     //   )
     // );
 
-    transactionItems.push(
-      new TransactionItem(
-        async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, 0, attemptNum),
-        "rebalance"
-      )
-    );
-
-    transactionItems.push(
-      new TransactionItem(
-        async () => ({
-          tx: client.protocolInteraction(
-            solautoAction("Withdraw", [{ __kind: "All" }])
-          ),
-        }),
-        "withdraw"
-      )
-    );
-
-    transactionItems.push(
-      new TransactionItem(
-        async () => ({
-          tx: client.closePositionIx(),
-        }),
-        "close position"
-      )
-    );
+    // transactionItems.push(
+    //   new TransactionItem(
+    //     async () => ({
+    //       tx: client.closePositionIx(),
+    //     }),
+    //     "close position"
+    //   )
+    // );
 
     const statuses = await new TransactionsManager(
       client,