@haven-fi/solauto-sdk 1.0.709 → 1.0.710

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.710",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

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