@tokemak/queries 0.0.18 → 0.0.20

package/dist/index.cjs

@@ -8619,17 +8619,22 @@ var updateRebalanceStats = async (wagmiConfig, {
 
 // functions/getAutopoolUserActivity.ts
 var import_graph_cli18 = require("@tokemak/graph-cli");
+var import_utils53 = require("@tokemak/utils");
 var getAutopoolUserActivity = async ({
-  autopoolAddress,
-  userAddress,
-  chainId = 1
+  autopool,
+  userAddress
 }) => {
-  const { GetUserAutopoolBalanceChangeHistory } = (0, import_graph_cli18.getSdkByChainId)(chainId);
+  if (!autopool || !autopool.chain?.chainId) {
+    throw new Error("Autopool not found");
+  }
+  const { GetUserAutopoolBalanceChangeHistory } = (0, import_graph_cli18.getSdkByChainId)(
+    autopool.chain?.chainId
+  );
   try {
     const userAutopoolBalanceChanges = await paginateQuery(
       (vars) => GetUserAutopoolBalanceChangeHistory({
         userAddress,
-        vaultAddress: autopoolAddress,
+        vaultAddress: autopool.poolAddress,
         first: vars?.first || 1e3,
         skip: vars?.skip || 0
       }),
@@ -8648,7 +8653,7 @@ var getAutopoolUserActivity = async ({
           totalWithdrawals: 0n,
           totalStakes: 0n,
           totalUnstakes: 0n,
-          chainId
+          chainId: autopool.chain?.chainId
         };
       }
       activity.items.forEach((item) => {
@@ -8676,12 +8681,17 @@ var getAutopoolUserActivity = async ({
         } else {
           eventType = "Unknown";
         }
+        const netDeposits = (0, import_utils53.formatUnitsNum)(
+          userActivityTotals[activity.vaultAddress].totalDeposits - userActivityTotals[activity.vaultAddress].totalWithdrawals,
+          autopool.baseAsset.decimals
+        );
         if (!item.staked) {
           events.push({
             timestamp: activity.timestamp,
             shareChange: item.shareChange,
             assetChange: item.assetChange,
             vaultAddress: activity.vaultAddress,
+            netDeposits,
             eventType
             // staked: item.staked,
           });
@@ -8699,7 +8709,7 @@ var getAutopoolUserActivity = async ({
 var import_viem21 = require("viem");
 var import_core23 = require("@wagmi/core");
 var import_abis22 = require("@tokemak/abis");
-var import_utils53 = require("@tokemak/utils");
+var import_utils54 = require("@tokemak/utils");
 var getAutopoolUser = async (config, {
   autopool,
   address,
@@ -8741,14 +8751,14 @@ var getAutopoolUser = async (config, {
     args: [address],
     chainId: autopool?.chain?.chainId
   });
-  const stakedShares = (0, import_utils53.formatEtherNum)(stakedPoolShares);
+  const stakedShares = (0, import_utils54.formatEtherNum)(stakedPoolShares);
   const staked = convertBaseAssetToTokenPricesAndDenom(
     stakedShares * (autopool?.navPerShare.baseAsset || 0),
     autopool?.baseAsset.price,
     autopool?.denomination.price,
     prices
   );
-  const unstakedShares = (0, import_utils53.formatEtherNum)(unstakedPoolShares || 0n);
+  const unstakedShares = (0, import_utils54.formatEtherNum)(unstakedPoolShares || 0n);
   const unstaked = convertBaseAssetToTokenPricesAndDenom(
     unstakedShares * (autopool?.navPerShare.baseAsset || 0),
     autopool?.baseAsset.price,
@@ -8763,7 +8773,7 @@ var getAutopoolUser = async (config, {
     prices
   );
   const totalDeposits = convertBaseAssetToTokenPricesAndDenom(
-    (0, import_utils53.formatUnitsNum)(
+    (0, import_utils54.formatUnitsNum)(
       userActivity?.totals[autopool?.poolAddress]?.totalDeposits || 0n,
       autopool?.baseAsset.decimals
     ),
@@ -8772,7 +8782,7 @@ var getAutopoolUser = async (config, {
     prices
   );
   const totalWithdrawals = convertBaseAssetToTokenPricesAndDenom(
-    (0, import_utils53.formatUnitsNum)(
+    (0, import_utils54.formatUnitsNum)(
       userActivity?.totals[autopool?.poolAddress]?.totalWithdrawals || 0n,
       autopool?.baseAsset.decimals
     ),
@@ -8797,7 +8807,7 @@ var getAutopoolUser = async (config, {
   );
   let lastDeposit;
   if (poolEvents && poolEvents?.length > 0) {
-    lastDeposit = (0, import_utils53.convertTimestampToDate)(
+    lastDeposit = (0, import_utils54.convertTimestampToDate)(
       poolEvents[poolEvents.length - 1].timestamp
     ).toLocaleDateString("en-US", {
       day: "2-digit",
@@ -8864,6 +8874,7 @@ var getAutopoolHistory = async (autopool) => {
 };
 
 // functions/getAutopoolUserHistory.ts
+var import_utils58 = require("@tokemak/utils");
 var getAutopoolUserHistory = async ({
   userAddress,
   autopool,
@@ -8909,27 +8920,42 @@ var getAutopoolUserHistory = async ({
         };
         filledMissingDates.unshift(dayBeforeEntry);
       }
+      let lastKnownNetDeposits = null;
       const matchedData = filledMissingDates.map((userVaultDayData) => {
         const matchingAutopoolDayData = autopoolDayData.find(
           (autopoolDay) => autopoolDay.date.toDateString() === userVaultDayData.date.toDateString()
         );
-        const userPortionOfVault = userVaultDayData.totalShares / matchingAutopoolDayData?.totalSupply;
-        const userNav = userPortionOfVault * matchingAutopoolDayData?.nav;
+        const userPortionOfVault = (0, import_utils58.formatEtherNum)(userVaultDayData.totalShares) / (0, import_utils58.formatEtherNum)(matchingAutopoolDayData?.totalSupply);
+        const userNav = userPortionOfVault * (0, import_utils58.formatUnitsNum)(
+          BigInt(matchingAutopoolDayData?.nav || 0),
+          autopool?.baseAsset.decimals
+        );
         const eventsForDay = userActivity.events?.filter((event) => {
           const eventDate = new Date(Number(event.timestamp) * 1e3);
-          const windowStart = new Date(
-            userVaultDayData.date.getTime() - 24 * 60 * 60 * 1e3
+          const windowStart = new Date(userVaultDayData.date.getTime());
+          const windowEnd = new Date(
+            userVaultDayData.date.getTime() + 24 * 60 * 60 * 1e3
           );
-          const windowEnd = userVaultDayData.date;
           const matches = eventDate.getTime() > windowStart.getTime() && eventDate.getTime() <= windowEnd.getTime();
           return matches;
         });
+        const lastEventForDay = eventsForDay && eventsForDay.length > 0 ? eventsForDay.sort(
+          (a, b) => Number(b.timestamp) - Number(a.timestamp)
+        )[0] : 0;
+        let netDeposits = 0;
+        if (lastEventForDay && "netDeposits" in lastEventForDay && typeof lastEventForDay.netDeposits === "number") {
+          netDeposits = lastEventForDay.netDeposits;
+          lastKnownNetDeposits = netDeposits;
+        } else {
+          netDeposits = lastKnownNetDeposits;
+        }
         return {
           date: userVaultDayData.date,
           timestamp: userVaultDayData.timestamp,
           baseAsset: autopool?.baseAsset.symbol,
           nav: userNav,
-          events: eventsForDay
+          events: eventsForDay,
+          netDeposits
         };
       });
       return matchedData;

package/dist/index.d.ts

@@ -3145,10 +3145,9 @@ declare const getChainAutopoolsApr: (chainId: number) => Promise<ChainAutopoolsA
 
 declare const getBlobData: (blobName: string) => Promise<any>;
 
-declare const getAutopoolUserActivity: ({ autopoolAddress, userAddress, chainId, }: {
-    autopoolAddress: Address;
+declare const getAutopoolUserActivity: ({ autopool, userAddress, }: {
+    autopool: IAutopool;
     userAddress: Address;
-    chainId?: SupportedChainIds;
 }) => Promise<never[] | {
     events: {
         timestamp: number;
@@ -3156,6 +3155,7 @@ declare const getAutopoolUserActivity: ({ autopoolAddress, userAddress, chainId,
         assetChange: string;
         vaultAddress: string;
         eventType: EventType;
+        netDeposits?: number;
     }[];
     totals: UserActivityTotalsType;
 }>;
@@ -3330,6 +3330,7 @@ declare const getAutopoolUserHistory: ({ userAddress, autopool, userActivity, }:
         vaultAddress: string;
         eventType: EventType;
     }[];
+    netDeposits: number | null;
 }[]>;
 
 declare const getAutopoolHistory: (autopool: IAutopool) => Promise<{

package/dist/index.js

@@ -8578,17 +8578,22 @@ var updateRebalanceStats = async (wagmiConfig, {
 
 // functions/getAutopoolUserActivity.ts
 import { getSdkByChainId as getSdkByChainId18 } from "@tokemak/graph-cli";
+import { formatUnitsNum as formatUnitsNum6 } from "@tokemak/utils";
 var getAutopoolUserActivity = async ({
-  autopoolAddress,
-  userAddress,
-  chainId = 1
+  autopool,
+  userAddress
 }) => {
-  const { GetUserAutopoolBalanceChangeHistory } = getSdkByChainId18(chainId);
+  if (!autopool || !autopool.chain?.chainId) {
+    throw new Error("Autopool not found");
+  }
+  const { GetUserAutopoolBalanceChangeHistory } = getSdkByChainId18(
+    autopool.chain?.chainId
+  );
   try {
     const userAutopoolBalanceChanges = await paginateQuery(
       (vars) => GetUserAutopoolBalanceChangeHistory({
         userAddress,
-        vaultAddress: autopoolAddress,
+        vaultAddress: autopool.poolAddress,
         first: vars?.first || 1e3,
         skip: vars?.skip || 0
       }),
@@ -8607,7 +8612,7 @@ var getAutopoolUserActivity = async ({
           totalWithdrawals: 0n,
           totalStakes: 0n,
           totalUnstakes: 0n,
-          chainId
+          chainId: autopool.chain?.chainId
         };
       }
       activity.items.forEach((item) => {
@@ -8635,12 +8640,17 @@ var getAutopoolUserActivity = async ({
         } else {
           eventType = "Unknown";
         }
+        const netDeposits = formatUnitsNum6(
+          userActivityTotals[activity.vaultAddress].totalDeposits - userActivityTotals[activity.vaultAddress].totalWithdrawals,
+          autopool.baseAsset.decimals
+        );
         if (!item.staked) {
           events.push({
             timestamp: activity.timestamp,
             shareChange: item.shareChange,
             assetChange: item.assetChange,
             vaultAddress: activity.vaultAddress,
+            netDeposits,
             eventType
             // staked: item.staked,
           });
@@ -8661,7 +8671,7 @@ import { autopoolEthAbi as autopoolEthAbi5 } from "@tokemak/abis";
 import {
   convertTimestampToDate as convertTimestampToDate4,
   formatEtherNum as formatEtherNum14,
-  formatUnitsNum as formatUnitsNum6
+  formatUnitsNum as formatUnitsNum7
 } from "@tokemak/utils";
 var getAutopoolUser = async (config, {
   autopool,
@@ -8726,7 +8736,7 @@ var getAutopoolUser = async (config, {
     prices
   );
   const totalDeposits = convertBaseAssetToTokenPricesAndDenom(
-    formatUnitsNum6(
+    formatUnitsNum7(
       userActivity?.totals[autopool?.poolAddress]?.totalDeposits || 0n,
       autopool?.baseAsset.decimals
     ),
@@ -8735,7 +8745,7 @@ var getAutopoolUser = async (config, {
     prices
   );
   const totalWithdrawals = convertBaseAssetToTokenPricesAndDenom(
-    formatUnitsNum6(
+    formatUnitsNum7(
       userActivity?.totals[autopool?.poolAddress]?.totalWithdrawals || 0n,
       autopool?.baseAsset.decimals
     ),
@@ -8827,6 +8837,7 @@ var getAutopoolHistory = async (autopool) => {
 };
 
 // functions/getAutopoolUserHistory.ts
+import { formatEtherNum as formatEtherNum15, formatUnitsNum as formatUnitsNum8 } from "@tokemak/utils";
 var getAutopoolUserHistory = async ({
   userAddress,
   autopool,
@@ -8872,27 +8883,42 @@ var getAutopoolUserHistory = async ({
         };
         filledMissingDates.unshift(dayBeforeEntry);
       }
+      let lastKnownNetDeposits = null;
       const matchedData = filledMissingDates.map((userVaultDayData) => {
         const matchingAutopoolDayData = autopoolDayData.find(
           (autopoolDay) => autopoolDay.date.toDateString() === userVaultDayData.date.toDateString()
         );
-        const userPortionOfVault = userVaultDayData.totalShares / matchingAutopoolDayData?.totalSupply;
-        const userNav = userPortionOfVault * matchingAutopoolDayData?.nav;
+        const userPortionOfVault = formatEtherNum15(userVaultDayData.totalShares) / formatEtherNum15(matchingAutopoolDayData?.totalSupply);
+        const userNav = userPortionOfVault * formatUnitsNum8(
+          BigInt(matchingAutopoolDayData?.nav || 0),
+          autopool?.baseAsset.decimals
+        );
         const eventsForDay = userActivity.events?.filter((event) => {
           const eventDate = new Date(Number(event.timestamp) * 1e3);
-          const windowStart = new Date(
-            userVaultDayData.date.getTime() - 24 * 60 * 60 * 1e3
+          const windowStart = new Date(userVaultDayData.date.getTime());
+          const windowEnd = new Date(
+            userVaultDayData.date.getTime() + 24 * 60 * 60 * 1e3
           );
-          const windowEnd = userVaultDayData.date;
           const matches = eventDate.getTime() > windowStart.getTime() && eventDate.getTime() <= windowEnd.getTime();
           return matches;
         });
+        const lastEventForDay = eventsForDay && eventsForDay.length > 0 ? eventsForDay.sort(
+          (a, b) => Number(b.timestamp) - Number(a.timestamp)
+        )[0] : 0;
+        let netDeposits = 0;
+        if (lastEventForDay && "netDeposits" in lastEventForDay && typeof lastEventForDay.netDeposits === "number") {
+          netDeposits = lastEventForDay.netDeposits;
+          lastKnownNetDeposits = netDeposits;
+        } else {
+          netDeposits = lastKnownNetDeposits;
+        }
         return {
           date: userVaultDayData.date,
           timestamp: userVaultDayData.timestamp,
           baseAsset: autopool?.baseAsset.symbol,
           nav: userNav,
-          events: eventsForDay
+          events: eventsForDay,
+          netDeposits
         };
       });
       return matchedData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokemak/queries",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -26,11 +26,11 @@
     "@wagmi/core": "2.x",
     "wagmi": "2.x",
     "@tokemak/abis": "0.0.3",
-    "@tokemak/constants": "0.0.4",
-    "@tokemak/graph-cli": "0.0.10",
     "@tokemak/config": "0.0.4",
     "@tokemak/tokenlist": "0.0.3",
-    "@tokemak/utils": "0.0.5"
+    "@tokemak/constants": "0.0.4",
+    "@tokemak/utils": "0.0.5",
+    "@tokemak/graph-cli": "0.0.10"
   },
   "scripts": {
     "build": "tsup",