@haven-fi/solauto-sdk 1.0.709 → 1.0.711

package/dist/services/swap/jupSwapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,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;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAwBhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}
+{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,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;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YA+BhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}

package/dist/services/swap/jupSwapManager.js

@@ -12,8 +12,13 @@ class JupSwapManager {
         this.jupQuote = undefined;
     }
     async getQuote(data) {
-        const memeSwap = (0, utils_1.tokenInfo)(data.inputMint).isMeme || (0, utils_1.tokenInfo)(data.outputMint).isMeme;
-        const slippageBps = data.slippageBps ?? (memeSwap ? 250 : 100);
+        const inputMintInfo = (0, utils_1.tokenInfo)(data.inputMint);
+        const outputMintInfo = (0, utils_1.tokenInfo)(data.outputMint);
+        const lowLiquidityMint = !inputMintInfo ||
+            inputMintInfo?.isMeme ||
+            !outputMintInfo ||
+            outputMintInfo?.isMeme;
+        const slippageBps = data.slippageBps ?? (lowLiquidityMint ? 250 : 100);
         return await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum) => await this.jupApi.quoteGet({
             amount: Number(data.amount),
             inputMint: data.inputMint.toString(),
@@ -24,7 +29,9 @@ class JupSwapManager {
                     ? "ExactIn"
                     : undefined,
             slippageBps,
-            maxAccounts: !data.exactOut ? (memeSwap ? 25 : 15) + attemptNum * 5 : undefined,
+            maxAccounts: !data.exactOut
+                ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
+                : undefined,
         }), 6, 250);
     }
     async getJupInstructions(data) {

package/dist/utils/stringUtils.d.ts

@@ -1,6 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
 export declare const StrategyTypes: readonly ["Long", "Short", "Ratio"];
 export type StrategyType = (typeof StrategyTypes)[number];
+export declare function ratioMintDetails(supplyMint?: PublicKey, debtMint?: PublicKey): {
+    order: (PublicKey | undefined)[];
+    strategyName: string;
+};
 export declare function ratioName(supplyMint?: PublicKey, debtMint?: PublicKey): string;
 export declare function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey): string;
 export declare function strategyType(supplyMint: PublicKey, debtMint: PublicKey): StrategyType;

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

@@ -1 +1 @@
-{"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,eAAO,MAAM,aAAa,qCAAsC,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAc1D,wBAAgB,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,UAYrE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,UAcrB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,GAClB,YAAY,CAWd"}
+{"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,eAAO,MAAM,aAAa,qCAAsC,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAc1D,wBAAgB,gBAAgB,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS;;;EAY5E;AAED,wBAAgB,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,UAGrE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,UAcrB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,GAClB,YAAY,CAWd"}

package/dist/utils/stringUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StrategyTypes = void 0;
+exports.ratioMintDetails = ratioMintDetails;
 exports.ratioName = ratioName;
 exports.solautoStrategyName = solautoStrategyName;
 exports.strategyType = strategyType;
@@ -21,18 +22,22 @@ function adjustedTicker(mint) {
         return info.ticker;
     }
 }
-function ratioName(supplyMint, debtMint) {
+function ratioMintDetails(supplyMint, debtMint) {
     if (((0, generalUtils_1.tokenInfo)(supplyMint).isLST && debtMint?.equals(spl_token_1.NATIVE_MINT)) ||
         (supplyMint &&
             debtMint &&
             constants_1.MAJORS_PRIO[supplyMint?.toString() ?? ""] >
                 constants_1.MAJORS_PRIO[debtMint?.toString() ?? ""])) {
-        return `${adjustedTicker(supplyMint)}/${adjustedTicker(debtMint)} Long`;
+        return { order: [supplyMint, debtMint], strategyName: "Long" };
     }
     else {
-        return `${adjustedTicker(debtMint)}/${adjustedTicker(supplyMint)} Short`;
+        return { order: [debtMint, supplyMint], strategyName: "Short" };
     }
 }
+function ratioName(supplyMint, debtMint) {
+    const { order, strategyName } = ratioMintDetails(supplyMint, debtMint);
+    return `${adjustedTicker(order[0])}/${adjustedTicker(order[1])} ${strategyName}`;
+}
 function solautoStrategyName(supplyMint, debtMint) {
     const strat = strategyType(supplyMint ?? web3_js_1.PublicKey.default, debtMint ?? web3_js_1.PublicKey.default);
     if (strat === "Long") {

package/local/logPositions.ts

@@ -7,7 +7,6 @@ import {
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LOCAL_IRONFORGE_API_URL,
-  PRICES,
   ProgramEnv,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
@@ -109,7 +108,6 @@ async function main(filterWhitelist: boolean, programEnv: ProgramEnv = "Prod") {
     )
   );
   await fetchTokenPrices(tokensUsed.map((x) => new PublicKey(x)));
-  console.log(PRICES);
 
   console.log("\n\n");
 
@@ -122,7 +120,7 @@ async function main(filterWhitelist: boolean, programEnv: ProgramEnv = "Prod") {
     const repayFrom = pos.settings!.repayToBps + pos.settings!.repayGap;
     const unhealthy = actionToTake === "repay";
     const healthText = unhealthy
-      ? `(Unhealthy: ${pos.state.liqUtilizationRateBps - repayFrom}bps)`
+      ? `(Unhealthy: ${pos.liqUtilizationRateBps() - repayFrom}bps)`
       : "";
     if (unhealthy) {
       unhealthyPositions += 1;

package/package.json

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

package/src/services/swap/jupSwapManager.ts

@@ -21,6 +21,7 @@ import {
   tokenInfo,
 } from "../../utils";
 import { TransactionItemInputs } from "../../types";
+import { TokenInfo } from "../../constants";
 
 export interface SwapInput {
   inputMint: PublicKey;
@@ -53,9 +54,14 @@ export class JupSwapManager {
   constructor(private signer: Signer) {}
 
   public async getQuote(data: SwapInput): Promise<QuoteResponse> {
-    const memeSwap =
-      tokenInfo(data.inputMint).isMeme || tokenInfo(data.outputMint).isMeme;
-    const slippageBps = data.slippageBps ?? (memeSwap ? 250 : 100);
+    const inputMintInfo: TokenInfo | undefined = tokenInfo(data.inputMint);
+    const outputMintInfo: TokenInfo | undefined = tokenInfo(data.outputMint);
+    const lowLiquidityMint =
+      !inputMintInfo ||
+      inputMintInfo?.isMeme ||
+      !outputMintInfo ||
+      outputMintInfo?.isMeme;
+    const slippageBps = data.slippageBps ?? (lowLiquidityMint ? 250 : 100);
 
     return await retryWithExponentialBackoff(
       async (attemptNum: number) =>
@@ -69,7 +75,9 @@ export class JupSwapManager {
               ? "ExactIn"
               : undefined,
           slippageBps,
-          maxAccounts: !data.exactOut ? (memeSwap ? 25 : 15) + attemptNum * 5 : undefined,
+          maxAccounts: !data.exactOut
+            ? (lowLiquidityMint ? 25 : 15) + attemptNum * 5
+            : undefined,
         }),
       6,
       250

package/src/utils/stringUtils.ts

@@ -18,7 +18,7 @@ function adjustedTicker(mint?: PublicKey) {
   }
 }
 
-export function ratioName(supplyMint?: PublicKey, debtMint?: PublicKey) {
+export function ratioMintDetails(supplyMint?: PublicKey, debtMint?: PublicKey) {
   if (
     (tokenInfo(supplyMint).isLST && debtMint?.equals(NATIVE_MINT)) ||
     (supplyMint &&
@@ -26,12 +26,17 @@ export function ratioName(supplyMint?: PublicKey, debtMint?: PublicKey) {
       MAJORS_PRIO[supplyMint?.toString() ?? ""] >
         MAJORS_PRIO[debtMint?.toString() ?? ""])
   ) {
-    return `${adjustedTicker(supplyMint)}/${adjustedTicker(debtMint)} Long`;
+    return { order: [supplyMint, debtMint], strategyName: "Long" };
   } else {
-    return `${adjustedTicker(debtMint)}/${adjustedTicker(supplyMint)} Short`;
+    return { order: [debtMint, supplyMint], strategyName: "Short" };
   }
 }
 
+export function ratioName(supplyMint?: PublicKey, debtMint?: PublicKey) {
+  const { order, strategyName } = ratioMintDetails(supplyMint, debtMint);
+  return `${adjustedTicker(order[0])}/${adjustedTicker(order[1])} ${strategyName}`;
+}
+
 export function solautoStrategyName(
   supplyMint?: PublicKey,
   debtMint?: PublicKey