@haven-fi/solauto-sdk 1.0.462 → 1.0.464

package/dist/utils/jupiterUtils.js

@@ -85,10 +85,10 @@ async function getJupPriceData(mints, extraInfo) {
         if (!result ||
             result === null ||
             (typeof result === "object" &&
-                Object.values(result).includes([null, undefined]))) {
+                Boolean(Object.values(data).filter((x) => x === null).length))) {
             throw new Error("Failed to get token prices using Jupiter");
         }
         return result;
-    }, 6);
+    }, 8);
     return data;
 }

package/local/logPositions.ts

@@ -246,9 +246,16 @@ async function main(filterWhitelist: boolean) {
   );
 
   const tvl = latestStates
+    .map((x) =>
+      fromBaseUnit(x.supply.amountUsed.baseAmountUsdValue, USD_DECIMALS)
+    )
+    .reduce((acc, curr) => acc + curr, 0);
+  const netWorth = latestStates
     .map((x) => fromBaseUnit(x.netWorth.baseAmountUsdValue, USD_DECIMALS))
     .reduce((acc, curr) => acc + curr, 0);
-  console.log(`Total TVL: $${formatNumber(tvl, 2, 10000, 2)}`);
+
+  console.log(`TVL: $${formatNumber(tvl, 2, 10000, 2)}`);
+  console.log(`Total net worth: $${formatNumber(netWorth, 2, 10000, 2)}`);
 }
 
 const filterWhitelist = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.462",
+  "version": "1.0.464",
   "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,12 +168,12 @@ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
       !result ||
       result === null ||
       (typeof result === "object" &&
-        Object.values(result).includes([null, undefined]))
+        Boolean(Object.values(data).filter((x) => x === null).length))
     ) {
       throw new Error("Failed to get token prices using Jupiter");
     }
     return result;
-  }, 6);
+  }, 8);
 
   return data as { [key: string]: any };
 }