@haven-fi/solauto-sdk 1.0.128 → 1.0.129

package/dist/clients/solautoMarginfiClient.js

@@ -12,7 +12,6 @@ const generalUtils_1 = require("../utils/generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const marginfiUtils_1 = require("../utils/marginfiUtils");
 const numberUtils_1 = require("../utils/numberUtils");
-const constants_1 = require("../constants");
 const utils_1 = require("../utils");
 class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     constructor() {
@@ -418,8 +417,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, this.supplyMint, this.debtMint, this.livePositionUpdates);
         if (freshState) {
             this.log("Fresh state", freshState);
-            const supplyPrice = constants_1.PRICES[(freshState?.supply.mint ?? web3_js_1.PublicKey.default).toString()].price;
-            const debtPrice = constants_1.PRICES[(freshState?.debt.mint ?? web3_js_1.PublicKey.default).toString()].price;
+            const supplyPrice = (0, generalUtils_1.safeGetPrice)(freshState?.supply.mint);
+            const debtPrice = (0, generalUtils_1.safeGetPrice)(freshState?.debt.mint);
             this.log("Supply price: ", supplyPrice);
             this.log("Debt price: ", debtPrice);
             this.log("Liq threshold bps:", freshState.liqThresholdBps);

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,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AA6MzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA4HA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AA8MzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA4HA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}

package/dist/transactions/transactionUtils.js

@@ -17,7 +17,6 @@ const numberUtils_1 = require("../utils/numberUtils");
 const generalUtils_2 = require("../utils/solauto/generalUtils");
 const accountUtils_1 = require("../utils/accountUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
-const constants_1 = require("../constants");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
     const supplyIsWsol = client.supplyMint.equals(spl_token_1.NATIVE_MINT);
     const debtIsWsol = client.debtMint.equals(spl_token_1.NATIVE_MINT);
@@ -331,7 +330,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         client.log("Not eligible for a rebalance");
         return undefined;
     }
-    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), constants_1.PRICES[client.supplyMint.toString()].price, constants_1.PRICES[client.debtMint.toString()].price, targetLiqUtilizationRateBps);
+    const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), (0, generalUtils_1.safeGetPrice)(client.supplyMint), (0, generalUtils_1.safeGetPrice)(client.debtMint), targetLiqUtilizationRateBps);
     client.log("Rebalance values: ", values);
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
     const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);

package/dist/utils/generalUtils.d.ts

@@ -1,12 +1,13 @@
 import { PublicKey } from "@solana/web3.js";
-import { MaybeRpcAccount, Umi } from "@metaplex-foundation/umi";
+import { MaybeRpcAccount, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 export declare function generateRandomU8(): number;
 export declare function generateRandomU64(): bigint;
 export declare function currentUnixSeconds(): number;
 export declare function getSolanaAccountCreated(umi: Umi, pk: PublicKey): Promise<boolean>;
 export declare function rpcAccountCreated(account: MaybeRpcAccount): boolean;
 export declare function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean;
-export declare function getTokenPrices(mints: PublicKey[]): Promise<number[]>;
+export declare function fetchTokenPrices(mints: PublicKey[]): Promise<number[]>;
+export declare function safeGetPrice(mint: PublicKey | UmiPublicKey): number | undefined;
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;
 //# sourceMappingURL=generalUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+C1E;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAKtG,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+C5E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,CAK/E;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}

package/dist/utils/generalUtils.js

@@ -6,7 +6,8 @@ exports.currentUnixSeconds = currentUnixSeconds;
 exports.getSolanaAccountCreated = getSolanaAccountCreated;
 exports.rpcAccountCreated = rpcAccountCreated;
 exports.arraysAreEqual = arraysAreEqual;
-exports.getTokenPrices = getTokenPrices;
+exports.fetchTokenPrices = fetchTokenPrices;
+exports.safeGetPrice = safeGetPrice;
 exports.retryWithExponentialBackoff = retryWithExponentialBackoff;
 const umi_1 = require("@metaplex-foundation/umi");
 const pythConstants_1 = require("../constants/pythConstants");
@@ -44,7 +45,7 @@ function arraysAreEqual(arrayA, arrayB) {
     }
     return true;
 }
-async function getTokenPrices(mints) {
+async function fetchTokenPrices(mints) {
     const currentTime = currentUnixSeconds();
     if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
         currentTime - solautoConstants_1.PRICES[mint.toString()].time > 3)) {
@@ -79,6 +80,12 @@ async function getTokenPrices(mints) {
     }
     return prices;
 }
+function safeGetPrice(mint) {
+    if (mint.toString() in solautoConstants_1.PRICES) {
+        return solautoConstants_1.PRICES[mint.toString()].price;
+    }
+    return undefined;
+}
 function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow) {
     return new Promise((resolve, reject) => {
         const attempt = (attemptNum) => {

package/dist/utils/marginfiUtils.js

@@ -11,7 +11,6 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const generalUtils_1 = require("./generalUtils");
 const numberUtils_1 = require("./numberUtils");
-const solautoConstants_1 = require("../constants/solautoConstants");
 const marginfiAccounts_1 = require("../constants/marginfiAccounts");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const solanaUtils_1 = require("./solanaUtils");
@@ -36,7 +35,7 @@ async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
         debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debt.mint.toString()].bank));
     }
     if (!supplyPrice) {
-        const [price] = await (0, generalUtils_1.getTokenPrices)([
+        const [price] = await (0, generalUtils_1.fetchTokenPrices)([
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supply.bank.mint),
         ]);
         supplyPrice = price;
@@ -101,7 +100,7 @@ async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
     let amountCanBeUsed = 0;
     let marketPrice = 0;
     if (bank !== null) {
-        [marketPrice] = await (0, generalUtils_1.getTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
+        [marketPrice] = await (0, generalUtils_1.fetchTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
         const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(umi, bank);
         const shareValue = isAsset ? assetShareValue : liabilityShareValue;
         amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
@@ -181,7 +180,7 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
     if (!debtUsage) {
         debtUsage = await getTokenUsage(umi, debtBank, false, 0, livePositionUpdates?.debtAdjustment);
     }
-    const supplyPrice = solautoConstants_1.PRICES[supplyMint.toString()].price;
+    const supplyPrice = (0, generalUtils_1.safeGetPrice)(supplyMint);
     let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(umi, {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
         bank: supplyBank,

package/dist/utils/solauto/generalUtils.js

@@ -213,7 +213,7 @@ async function getAllPositionsByAuthority(umi, user) {
 }
 async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     if (!supplyPrice || !debtPrice) {
-        [supplyPrice, debtPrice] = await (0, generalUtils_1.getTokenPrices)([
+        [supplyPrice, debtPrice] = await (0, generalUtils_1.fetchTokenPrices)([
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.supply.mint),
             (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(state.debt.mint),
         ]);

package/dist/utils/solauto/rebalanceUtils.js

@@ -138,11 +138,11 @@ function getFlashLoanDetails(client, values, jupQuote) {
     let flashLoanTokenPrice = 0;
     if (values.increasingLeverage) {
         flashLoanToken = client.solautoPositionState.debt;
-        flashLoanTokenPrice = solautoConstants_1.PRICES[client.debtMint.toString()].price;
+        flashLoanTokenPrice = (0, generalUtils_2.safeGetPrice)(client.debtMint);
     }
     else {
         flashLoanToken = client.solautoPositionState.supply;
-        flashLoanTokenPrice = solautoConstants_1.PRICES[client.supplyMint.toString()].price;
+        flashLoanTokenPrice = (0, generalUtils_2.safeGetPrice)(client.supplyMint);
     }
     const exactAmountBaseUnit = jupQuote && jupQuote.swapMode === "ExactOut"
         ? BigInt(parseInt(jupQuote.inAmount))
@@ -166,15 +166,15 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         : client.solautoPositionState.debt;
     const usdToSwap = Math.abs(values.debtAdjustmentUsd) + values.amountUsdToDcaIn;
     const inputPrice = values.increasingLeverage
-        ? solautoConstants_1.PRICES[client.debtMint.toString()].price
-        : solautoConstants_1.PRICES[client.supplyMint.toString()].price;
+        ? (0, generalUtils_2.safeGetPrice)(client.debtMint)
+        : (0, generalUtils_2.safeGetPrice)(client.supplyMint);
     const inputAmount = (0, numberUtils_1.toBaseUnit)(usdToSwap / inputPrice, input.decimals);
     const rebalancingToZero = targetLiqUtilizationRateBps === 0;
     return {
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
         destinationWallet: client.solautoPosition,
-        slippageBpsIncFactor: 0.25 + (attemptNum ?? 0) * 0.2,
+        slippageBpsIncFactor: 0.5 + (attemptNum ?? 0) * 0.2,
         amount: rebalancingToZero
             ? client.solautoPositionState.debt.amountUsed.baseUnit +
                 BigInt(Math.round(Number(client.solautoPositionState.debt.amountUsed.baseUnit) *

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -32,7 +32,7 @@ import {
   marginfiRefreshData,
 } from "../generated";
 import { getMarginfiAccountPDA, getTokenAccount } from "../utils/accountUtils";
-import { generateRandomU64 } from "../utils/generalUtils";
+import { generateRandomU64, safeGetPrice } from "../utils/generalUtils";
 import {
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
@@ -630,8 +630,8 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     if (freshState) {
       this.log("Fresh state", freshState);
-      const supplyPrice = PRICES[(freshState?.supply.mint ?? PublicKey.default).toString()].price;
-      const debtPrice = PRICES[(freshState?.debt.mint ?? PublicKey.default).toString()].price;
+      const supplyPrice = safeGetPrice(freshState?.supply.mint)!;
+      const debtPrice = safeGetPrice(freshState?.debt.mint)!;
       this.log("Supply price: ", supplyPrice);
       this.log("Debt price: ", debtPrice);
       this.log("Liq threshold bps:", freshState.liqThresholdBps);

package/src/transactions/transactionUtils.ts

@@ -39,6 +39,7 @@ import {
   currentUnixSeconds,
   getSolanaAccountCreated,
   rpcAccountCreated,
+  safeGetPrice,
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
 import {
@@ -586,8 +587,8 @@ export async function buildSolautoRebalanceTransaction(
     client.solautoPositionSettings(),
     client.solautoPositionActiveDca(),
     currentUnixSeconds(),
-    PRICES[client.supplyMint.toString()].price,
-    PRICES[client.debtMint.toString()].price,
+    safeGetPrice(client.supplyMint)!,
+    safeGetPrice(client.debtMint)!,
     targetLiqUtilizationRateBps
   );
   client.log("Rebalance values: ", values);

package/src/utils/generalUtils.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
+import { MaybeRpcAccount, publicKey, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
@@ -45,7 +45,7 @@ export function arraysAreEqual(arrayA: number[], arrayB: number[]): boolean {
   return true;
 }
 
-export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
+export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
   const currentTime = currentUnixSeconds();
   if (
     !mints.some(
@@ -94,6 +94,13 @@ export async function getTokenPrices(mints: PublicKey[]): Promise<number[]> {
   return prices;
 }
 
+export function safeGetPrice(mint: PublicKey | UmiPublicKey): number | undefined {
+  if (mint.toString() in PRICES) {
+    return PRICES[mint.toString()].price;
+  }
+  return undefined;
+}
+
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 
 export function retryWithExponentialBackoff<T>(

package/src/utils/marginfiUtils.ts

@@ -8,7 +8,7 @@ import {
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
-import { currentUnixSeconds, getTokenPrices } from "./generalUtils";
+import { currentUnixSeconds, fetchTokenPrices, safeGetPrice } from "./generalUtils";
 import {
   bytesToI80F48,
   fromBaseUnit,
@@ -72,7 +72,7 @@ export async function getMaxLtvAndLiqThreshold(
   }
 
   if (!supplyPrice) {
-    const [price] = await getTokenPrices([
+    const [price] = await fetchTokenPrices([
       toWeb3JsPublicKey(supply.bank!.mint),
     ]);
     supplyPrice = price;
@@ -177,7 +177,7 @@ async function getTokenUsage(
   let marketPrice = 0;
 
   if (bank !== null) {
-    [marketPrice] = await getTokenPrices([toWeb3JsPublicKey(bank.mint)]);
+    [marketPrice] = await fetchTokenPrices([toWeb3JsPublicKey(bank.mint)]);
     const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(
       umi,
       bank
@@ -335,7 +335,7 @@ export async function getMarginfiAccountPositionState(
     );
   }
 
-  const supplyPrice = PRICES[supplyMint!.toString()].price;
+  const supplyPrice = safeGetPrice(supplyMint!)!;
   let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
     umi,
     {

package/src/utils/solauto/generalUtils.ts

@@ -13,7 +13,7 @@ import {
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
 } from "../../generated";
-import { currentUnixSeconds, getTokenPrices } from "../generalUtils";
+import { currentUnixSeconds, fetchTokenPrices } from "../generalUtils";
 import {
   fromBaseUnit,
   getLiqUtilzationRateBps,
@@ -323,7 +323,7 @@ export async function positionStateWithLatestPrices(
   debtPrice?: number
 ): Promise<PositionState> {
   if (!supplyPrice || !debtPrice) {
-    [supplyPrice, debtPrice] = await getTokenPrices([
+    [supplyPrice, debtPrice] = await fetchTokenPrices([
       toWeb3JsPublicKey(state.supply.mint),
       toWeb3JsPublicKey(state.debt.mint),
     ]);

package/src/utils/solauto/rebalanceUtils.ts

@@ -14,7 +14,7 @@ import {
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
-import { currentUnixSeconds } from "../generalUtils";
+import { currentUnixSeconds, safeGetPrice } from "../generalUtils";
 import {
   fromBaseUnit,
   fromBps,
@@ -300,10 +300,10 @@ export function getFlashLoanDetails(
   let flashLoanTokenPrice = 0;
   if (values.increasingLeverage) {
     flashLoanToken = client.solautoPositionState!.debt;
-    flashLoanTokenPrice = PRICES[client.debtMint.toString()].price;
+    flashLoanTokenPrice = safeGetPrice(client.debtMint)!;
   } else {
     flashLoanToken = client.solautoPositionState!.supply;
-    flashLoanTokenPrice = PRICES[client.supplyMint.toString()].price;
+    flashLoanTokenPrice = safeGetPrice(client.supplyMint)!;
   }
 
   const exactAmountBaseUnit =
@@ -346,8 +346,8 @@ export function getJupSwapRebalanceDetails(
     Math.abs(values.debtAdjustmentUsd) + values.amountUsdToDcaIn;
 
   const inputPrice = values.increasingLeverage
-    ? PRICES[client.debtMint.toString()].price
-    : PRICES[client.supplyMint.toString()].price;
+    ? safeGetPrice(client.debtMint)
+    : safeGetPrice(client.supplyMint);
   const inputAmount = toBaseUnit(usdToSwap / inputPrice!, input.decimals);
 
   const rebalancingToZero = targetLiqUtilizationRateBps === 0;
@@ -355,7 +355,7 @@ export function getJupSwapRebalanceDetails(
     inputMint: toWeb3JsPublicKey(input.mint),
     outputMint: toWeb3JsPublicKey(output.mint),
     destinationWallet: client.solautoPosition,
-    slippageBpsIncFactor: 0.25 + (attemptNum ?? 0) * 0.2,
+    slippageBpsIncFactor: 0.5 + (attemptNum ?? 0) * 0.2,
     amount: rebalancingToZero
       ? client.solautoPositionState!.debt.amountUsed.baseUnit +
         BigInt(

package/tests/transactions/solautoMarginfi.ts

@@ -11,7 +11,7 @@ import {
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
 import { maxBoostToBps, maxRepayFromBps, maxRepayToBps, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
-import { getTokenPrices } from "../../src/utils/generalUtils";
+import { fetchTokenPrices } from "../../src/utils/generalUtils";
 import {
   TransactionItem,
   TransactionsManager,
@@ -70,7 +70,7 @@ describe("Solauto Marginfi tests", async () => {
     // const initialSupplyUsd = 150;
     // transactionItems.push(
     //   new TransactionItem(async () => {
-    //     const [supplyPrice] = await getTokenPrices([supply]);
+    //     const [supplyPrice] = await fetchTokenPrices([supply]);
     //     return {
     //       tx: client.protocolInteraction(
     //         solautoAction("Deposit", [
@@ -109,7 +109,7 @@ describe("Solauto Marginfi tests", async () => {
     // const initialSupplyUsd = 50;
     // transactionItems.push(
     //   new TransactionItem(async () => {
-    //     const [supplyPrice] = await getTokenPrices([supply]);
+    //     const [supplyPrice] = await fetchTokenPrices([supply]);
     //     return {
     //       tx: client.protocolInteraction(
     //         solautoAction("Deposit", [

package/tests/unit/rebalanceCalculations.ts

@@ -31,7 +31,8 @@ import {
 } from "../../src/utils/solauto/generalUtils";
 import {
   currentUnixSeconds,
-  getTokenPrices,
+  fetchTokenPrices,
+  safeGetPrice,
 } from "../../src/utils/generalUtils";
 import { USDC_MINT } from "../../src/constants/tokenConstants";
 import { PRICES } from "../../src/constants";
@@ -50,8 +51,8 @@ function assertAccurateRebalance(
       client.solautoPositionSettings(),
       client.solautoPositionActiveDca(),
       currentUnixSeconds(),
-      PRICES[client.supplyMint.toString()].price,
-      PRICES[client.debtMint.toString()].price,
+      safeGetPrice(client.supplyMint)!,
+      safeGetPrice(client.debtMint)!,
       targetLiqUtilizationRateBps
     );
 
@@ -124,7 +125,7 @@ async function getFakePosition(
     createFakePositionState(
       {
         amountUsed: supplyUsd / supplyPrice,
-        price: PRICES[NATIVE_MINT.toString()].price,
+        price: safeGetPrice(NATIVE_MINT)!,
         mint: NATIVE_MINT,
       },
       {
@@ -282,7 +283,7 @@ describe("Rebalance tests", async () => {
   let supplyPrice: number, debtPrice: number;
 
   before(async () => {
-    [supplyPrice, debtPrice] = await getTokenPrices([
+    [supplyPrice, debtPrice] = await fetchTokenPrices([
       NATIVE_MINT,
       new PublicKey(USDC_MINT),
     ]);