@haven-fi/solauto-sdk 1.0.538 → 1.0.540

package/dist/utils/jupiterUtils.d.ts

@@ -24,7 +24,7 @@ export interface JupSwapTransaction {
     swapIx: TransactionBuilder;
 }
 export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails, attemptNum?: number): Promise<JupSwapTransaction>;
-export declare function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, mayIncludeSpamTokens?: boolean): Promise<{
+export declare function getJupPriceData(mints: PublicKey[], mayIncludeSpamTokens?: boolean): Promise<{
     [key: string]: any;
 }>;
 //# sourceMappingURL=jupiterUtils.d.ts.map

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;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAsB1D;AAED,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,CAmF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,EAAE,OAAO;;GA6B5G"}
+{"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;AAUrB,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY;IAClD,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAgBD,wBAAsB,WAAW,CAAC,WAAW,EAAE,YAAY,0BAsB1D;AAED,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,CAmF7B;AAED,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO;;GAwC/B"}

package/dist/utils/jupiterUtils.js

@@ -85,11 +85,11 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
         swapIx: (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.swapInstruction))),
     };
 }
-async function getJupPriceData(mints, extraInfo, mayIncludeSpamTokens) {
+async function getJupPriceData(mints, mayIncludeSpamTokens) {
     const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await (await fetch("https://api.jup.ag/price/v2?ids=" +
             mints.map((x) => x.toString()).join(",") +
-            (extraInfo ? "&showExtraInfo=true" : ""))).json();
+            "&showExtraInfo=true")).json();
         const result = res.data;
         if (!result || result === null || typeof result !== "object") {
             throw new Error("Failed to get token prices using Jupiter");
@@ -101,7 +101,10 @@ async function getJupPriceData(mints, extraInfo, mayIncludeSpamTokens) {
         if (invalidValues && !mayIncludeSpamTokens) {
             throw new Error("Invalid price values");
         }
-        return result;
+        const trueData = Object.entries(result).reduce((acc, [key, val]) => val.extraInfo?.quotedPrice?.sellAt === null
+            ? { ...acc, [key]: { ...val, price: "0" } }
+            : { ...acc, [key]: val }, {});
+        return trueData;
     }, 8);
     return data;
 }

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;AAarE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAoDnB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO,qBAa/B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB;;;GAc/B"}
+{"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;AAarE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CAoDnB;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,EAClB,oBAAoB,CAAC,EAAE,OAAO,qBAqB/B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,oBAAoB;;;GAc/B"}

package/dist/utils/priceUtils.js

@@ -122,8 +122,15 @@ async function getJupTokenPrices(mints, mayIncludeSpamTokens) {
     if (mints.length == 0) {
         return [];
     }
-    const data = await (0, jupiterUtils_1.getJupPriceData)(mints, false, mayIncludeSpamTokens);
-    return Object.values(data).map((x) => x !== null && typeof x === "object" && "price" in x
+    const data = await (0, jupiterUtils_1.getJupPriceData)(mints, mayIncludeSpamTokens);
+    const sortedData = {};
+    for (const mint of mints) {
+        const key = mint.toString();
+        if (data.hasOwnProperty(key)) {
+            sortedData[key] = data[key];
+        }
+    }
+    return Object.values(sortedData).map((x) => x !== null && typeof x === "object" && "price" in x
         ? parseFloat(x.price)
         : 0);
 }

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

@@ -7,6 +7,7 @@ export declare function nextAutomationPeriodTimestamp(automation: AutomationSett
 export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings, currentUnixTime: number): boolean;
 export declare function getUpdatedValueFromAutomation(currValue: number, targetValue: number, automation: AutomationSettings, currentUnixTimestamp: number): number;
 export declare function getAdjustedSettingsFromAutomation(settings: SolautoSettingsParameters, currentUnixTime: number): SolautoSettingsParameters;
+export declare function sufficientLiquidityToBoost(positionState: PositionState, positionSettings: SolautoSettingsParameters | undefined, positionDca: DCASettings | undefined, supplyMintPrice: number, debtMintPrice: number): boolean;
 export declare function eligibleForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters | undefined, positionDca: DCASettings | undefined, currentUnixTime: number, supplyMintPrice: number, debtMintPrice: number, bpsDistanceThreshold?: number): RebalanceAction | undefined;
 export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters, currentUnixTime: number): boolean;
 export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey, positionTypeFilter?: PositionType): Promise<SolautoPositionDetails[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAGL,OAAO,EAEP,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAElB,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,gCAAgC,EAChC,SAAS,EAMV,MAAM,iBAAiB,CAAC;AAsBzB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAI9E,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAczE;AAgBD,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,eAAe,EAAE,MAAM,GACtB,yBAAyB,CAgB3B;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAAG,SAAS,EACvD,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,oBAAoB,SAAI,GACvB,eAAe,GAAG,SAAS,CAkE7B;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,eAAe,EAAE,MAAM,GACtB,OAAO,CAYT;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,EACrB,kBAAkB,CAAC,EAAE,YAAY,GAChC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAuFnC;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBzE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA+BtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,EACf,kBAAkB,CAAC,EAAE,YAAY,GAChC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6CnC;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,aAAa,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,CAAC,CAuCxB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAoEf;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CA8B3B;AAED,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEhD,qBAAa,mBAAmB;IACvB,gBAAgB,SAAa;IAC7B,cAAc,SAAa;IAC3B,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAC/C,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE,CAAa;IACpE,aAAa,EAAE,SAAS,GAAG,SAAS,CAAa;IAExD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IA6B9B,KAAK;IASL,UAAU,IAAI,OAAO;CAStB"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/generalUtils.js

@@ -6,6 +6,7 @@ exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
 exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
 exports.getUpdatedValueFromAutomation = getUpdatedValueFromAutomation;
 exports.getAdjustedSettingsFromAutomation = getAdjustedSettingsFromAutomation;
+exports.sufficientLiquidityToBoost = sufficientLiquidityToBoost;
 exports.eligibleForRebalance = eligibleForRebalance;
 exports.eligibleForRefresh = eligibleForRefresh;
 exports.getSolautoManagedPositions = getSolautoManagedPositions;
@@ -73,6 +74,22 @@ function getAdjustedSettingsFromAutomation(settings, currentUnixTime) {
         boostToBps,
     };
 }
+function sufficientLiquidityToBoost(positionState, positionSettings, positionDca, supplyMintPrice, debtMintPrice) {
+    const limitsUpToDate = positionState.supply.amountCanBeUsed.baseUnit > BigInt(0) ||
+        positionState.debt.amountCanBeUsed.baseUnit > BigInt(0);
+    if (limitsUpToDate) {
+        const values = (0, rebalanceUtils_1.getRebalanceValues)(positionState, positionSettings, positionDca, (0, generalUtils_1.currentUnixSeconds)(), supplyMintPrice, debtMintPrice);
+        const debtAvailable = (0, numberUtils_1.debtLiquidityUsdAvailable)(positionState);
+        const supplyDepositable = (0, numberUtils_1.supplyLiquidityUsdDepositable)(positionState);
+        const sufficientLiquidity = debtAvailable * 0.95 > values.debtAdjustmentUsd &&
+            supplyDepositable * 0.95 > values.debtAdjustmentUsd;
+        if (!sufficientLiquidity) {
+            (0, generalUtils_1.consoleLog)("Insufficient liquidity to further boost");
+        }
+        return sufficientLiquidity;
+    }
+    return true;
+}
 function eligibleForRebalance(positionState, positionSettings, positionDca, currentUnixTime, supplyMintPrice, debtMintPrice, bpsDistanceThreshold = 0) {
     if (!positionSettings) {
         return undefined;
@@ -92,20 +109,8 @@ function eligibleForRebalance(positionState, positionSettings, positionDca, curr
     const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
     const boostFrom = boostToBps - positionSettings.boostGap;
     if (positionState.liqUtilizationRateBps - boostFrom <= bpsDistanceThreshold) {
-        const limitsUpToDate = positionState.supply.amountCanBeUsed.baseUnit > BigInt(0) ||
-            positionState.debt.amountCanBeUsed.baseUnit > BigInt(0);
-        if (limitsUpToDate && positionState.liqUtilizationRateBps < boostFrom) {
-            const values = (0, rebalanceUtils_1.getRebalanceValues)(positionState, positionSettings, positionDca, (0, generalUtils_1.currentUnixSeconds)(), supplyMintPrice, debtMintPrice);
-            const debtAvailable = (0, numberUtils_1.debtLiquidityUsdAvailable)(positionState);
-            const supplyDepositable = (0, numberUtils_1.supplyLiquidityUsdDepositable)(positionState);
-            const sufficientLiquidity = debtAvailable * 0.95 > values.debtAdjustmentUsd &&
-                supplyDepositable * 0.95 > values.debtAdjustmentUsd;
-            if (!sufficientLiquidity) {
-                (0, generalUtils_1.consoleLog)("Insufficient liquidity to further boost");
-            }
-            return sufficientLiquidity ? "boost" : undefined;
-        }
-        return "boost";
+        const sufficientLiquidity = sufficientLiquidityToBoost(positionState, positionSettings, positionDca, supplyMintPrice, debtMintPrice);
+        return sufficientLiquidity ? "boost" : undefined;
     }
     else if (repayFrom - positionState.liqUtilizationRateBps <=
         bpsDistanceThreshold) {

package/package.json

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

package/src/utils/jupiterUtils.ts

@@ -171,13 +171,16 @@ export async function getJupSwapTransaction(
   };
 }
 
-export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, mayIncludeSpamTokens?: boolean) {
+export async function getJupPriceData(
+  mints: PublicKey[],
+  mayIncludeSpamTokens?: boolean
+) {
   const data = await retryWithExponentialBackoff(async () => {
     const res = await (
       await fetch(
         "https://api.jup.ag/price/v2?ids=" +
           mints.map((x) => x.toString()).join(",") +
-          (extraInfo ? "&showExtraInfo=true" : "")
+          "&showExtraInfo=true"
       )
     ).json();
     const result = res.data;
@@ -185,7 +188,7 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, m
       throw new Error("Failed to get token prices using Jupiter");
     }
 
-    const invalidValues = 
+    const invalidValues =
       Boolean(Object.values(result).filter((x) => x === null).length) ||
       Boolean(
         Object.values(result)
@@ -196,8 +199,18 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean, m
       throw new Error("Invalid price values");
     }
 
-    return result;
+    const trueData: { [key: string]: any } = Object.entries(
+      result as { [key: string]: any }
+    ).reduce(
+      (acc, [key, val]) =>
+        val.extraInfo?.quotedPrice?.sellAt === null
+          ? { ...acc, [key]: { ...val, price: "0" } }
+          : { ...acc, [key]: val },
+      {}
+    );
+
+    return trueData;
   }, 8);
 
-  return data as { [key: string]: any };
+  return data;
 }

package/src/utils/priceUtils.ts

@@ -163,9 +163,17 @@ export async function getJupTokenPrices(
     return [];
   }
 
-  const data = await getJupPriceData(mints, false, mayIncludeSpamTokens);
+  const data = await getJupPriceData(mints, mayIncludeSpamTokens);
+
+  const sortedData: { [key: string]: any } = {};
+  for (const mint of mints) {
+    const key = mint.toString();
+    if (data.hasOwnProperty(key)) {
+      sortedData[key] = data[key];
+    }
+  }
 
-  return Object.values(data).map((x) =>
+  return Object.values(sortedData).map((x) =>
     x !== null && typeof x === "object" && "price" in x
       ? parseFloat(x.price as string)
       : 0

package/src/utils/solauto/generalUtils.ts

@@ -132,6 +132,42 @@ export function getAdjustedSettingsFromAutomation(
   };
 }
 
+export function sufficientLiquidityToBoost(
+  positionState: PositionState,
+  positionSettings: SolautoSettingsParameters | undefined,
+  positionDca: DCASettings | undefined,
+  supplyMintPrice: number,
+  debtMintPrice: number
+) {
+  const limitsUpToDate =
+    positionState.supply.amountCanBeUsed.baseUnit > BigInt(0) ||
+    positionState.debt.amountCanBeUsed.baseUnit > BigInt(0);
+
+  if (limitsUpToDate) {
+    const values = getRebalanceValues(
+      positionState!,
+      positionSettings,
+      positionDca,
+      currentUnixSeconds(),
+      supplyMintPrice,
+      debtMintPrice
+    );
+
+    const debtAvailable = debtLiquidityUsdAvailable(positionState);
+    const supplyDepositable = supplyLiquidityUsdDepositable(positionState);
+    const sufficientLiquidity =
+      debtAvailable * 0.95 > values.debtAdjustmentUsd &&
+      supplyDepositable * 0.95 > values.debtAdjustmentUsd;
+
+    if (!sufficientLiquidity) {
+      consoleLog("Insufficient liquidity to further boost");
+    }
+    return sufficientLiquidity;
+  }
+
+  return true;
+}
+
 export function eligibleForRebalance(
   positionState: PositionState,
   positionSettings: SolautoSettingsParameters | undefined,
@@ -171,33 +207,14 @@ export function eligibleForRebalance(
   const boostFrom = boostToBps - positionSettings.boostGap;
 
   if (positionState.liqUtilizationRateBps - boostFrom <= bpsDistanceThreshold) {
-    const limitsUpToDate =
-      positionState.supply.amountCanBeUsed.baseUnit > BigInt(0) ||
-      positionState.debt.amountCanBeUsed.baseUnit > BigInt(0);
-
-    if (limitsUpToDate && positionState.liqUtilizationRateBps < boostFrom) {
-      const values = getRebalanceValues(
-        positionState!,
-        positionSettings,
-        positionDca,
-        currentUnixSeconds(),
-        supplyMintPrice,
-        debtMintPrice
-      );
-
-      const debtAvailable = debtLiquidityUsdAvailable(positionState);
-      const supplyDepositable = supplyLiquidityUsdDepositable(positionState);
-      const sufficientLiquidity =
-        debtAvailable * 0.95 > values.debtAdjustmentUsd &&
-        supplyDepositable * 0.95 > values.debtAdjustmentUsd;
-
-      if (!sufficientLiquidity) {
-        consoleLog("Insufficient liquidity to further boost");
-      }
-      return sufficientLiquidity ? "boost" : undefined;
-    }
-
-    return "boost";
+    const sufficientLiquidity = sufficientLiquidityToBoost(
+      positionState,
+      positionSettings,
+      positionDca,
+      supplyMintPrice,
+      debtMintPrice
+    );
+    return sufficientLiquidity ? "boost" : undefined;
   } else if (
     repayFrom - positionState.liqUtilizationRateBps <=
     bpsDistanceThreshold

package/tests/transactions/solautoMarginfi.ts

@@ -65,7 +65,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""