@haven-fi/solauto-sdk 1.0.468 → 1.0.469

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,CAiG7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GAsB5E"}
+{"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,CAiG7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}

package/dist/utils/jupiterUtils.js

@@ -85,7 +85,11 @@ async function getJupPriceData(mints, extraInfo) {
         if (!result ||
             result === null ||
             (typeof result === "object" &&
-                Boolean(Object.values(result).filter((x) => x === null).length))) {
+                Boolean(Object.values(result).filter((x) => x === null).length)) ||
+            (typeof result === "object" &&
+                Object.values(result)
+                    .map((x) => parseFloat(x.price))
+                    .includes(0))) {
             throw new Error("Failed to get token prices using Jupiter");
         }
         return result;

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,CA8CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAYzD;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;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"}

package/dist/utils/priceUtils.js

@@ -120,8 +120,7 @@ async function getJupTokenPrices(mints) {
         return [];
     }
     const data = await (0, jupiterUtils_1.getJupPriceData)(mints);
-    const prices = Object.values(data).map((x) => parseFloat(x.price));
-    return prices;
+    return Object.values(data).map((x) => parseFloat(x.price));
 }
 function safeGetPrice(mint) {
     if (mint && mint?.toString() in solautoConstants_1.PRICES) {

package/local/logPositions.ts

@@ -1,6 +1,8 @@
 import { publicKey } from "@metaplex-foundation/umi";
 import {
   buildHeliusApiUrl,
+  currentUnixSeconds,
+  eligibleForRebalance,
   fetchTokenPrices,
   fromBaseUnit,
   getSolanaRpcConnection,
@@ -203,10 +205,20 @@ async function main(filterWhitelist: boolean) {
       toWeb3JsPublicKey(pos.state.debt.mint)
     );
 
+    const actionToTake = eligibleForRebalance(
+      pos.state,
+      pos.position.settingParams,
+      pos.position.dca,
+      currentUnixSeconds(),
+      safeGetPrice(pos.state.supply.mint)!,
+      safeGetPrice(pos.state.debt.mint)!,
+      0
+    );
+
     const repayFrom =
       pos.position.settingParams.repayToBps +
       pos.position.settingParams.repayGap;
-    const unhealthy = latestState.liqUtilizationRateBps > repayFrom;
+    const unhealthy = actionToTake === "repay";
     const healthText = unhealthy
       ? `(Unhealthy: ${latestState.liqUtilizationRateBps - repayFrom}bps)`
       : "";
@@ -214,10 +226,7 @@ async function main(filterWhitelist: boolean) {
       unhealthyPositions += 1;
     }
 
-    const awaitingBoost =
-      latestState.liqUtilizationRateBps <
-      pos.position.settingParams.boostToBps -
-        pos.position.settingParams.boostGap;
+    const awaitingBoost = actionToTake === "boost";
     const boostText = awaitingBoost ? " (awaiting boost)" : "";
     if (awaitingBoost) {
       awaitingBoostPositions += 1;
@@ -230,7 +239,6 @@ async function main(filterWhitelist: boolean) {
     console.log(
       `${strategy}: $${formatNumber(fromBaseUnit(latestState.netWorth.baseAmountUsdValue, USD_DECIMALS), 2, 10000, 2)} ${healthText} ${boostText}`
     );
-    // console.log(latestState.liqUtilizationRateBps, repayFrom);
   }
 
   console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.468",
+  "version": "1.0.469",
   "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

@@ -168,7 +168,11 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
       !result ||
       result === null ||
       (typeof result === "object" &&
-        Boolean(Object.values(result).filter((x) => x === null).length))
+        Boolean(Object.values(result).filter((x) => x === null).length)) ||
+      (typeof result === "object" &&
+        Object.values(result)
+          .map((x) => parseFloat((x as any).price))
+          .includes(0))
     ) {
       throw new Error("Failed to get token prices using Jupiter");
     }

package/src/utils/priceUtils.ts

@@ -112,12 +112,12 @@ export async function getSwitchboardPrices(
           "mainnet",
           mints.map((x) => SWITCHBOARD_PRICE_FEED_IDS[x.toString()])
         );
-  
+
         const p = res.flatMap((x) => x.results[0]);
         if (p.filter((x) => !x || isNaN(Number(x))).length > 0) {
           throw new Error("Unable to fetch Switchboard prices");
         }
-  
+
         return p;
       },
       2,
@@ -131,7 +131,9 @@ export async function getSwitchboardPrices(
     prices = Array(mints.length).fill(0);
   }
 
-  const missingPrices = zip(mints, prices).filter((x) => !x[1] || isNaN(Number(x)));
+  const missingPrices = zip(mints, prices).filter(
+    (x) => !x[1] || isNaN(Number(x))
+  );
   const jupPrices = zip(
     missingPrices.map((x) => x[0]),
     await getJupTokenPrices(missingPrices.map((x) => x[0]))
@@ -151,11 +153,7 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
 
   const data = await getJupPriceData(mints);
 
-  const prices = Object.values(data).map(
-    (x) => parseFloat(x.price as string) as number
-  );
-
-  return prices;
+  return Object.values(data).map((x) => parseFloat(x.price as string));
 }
 
 export function safeGetPrice(