@tokemak/queries 0.0.17 → 0.0.18

package/dist/index.cjs

@@ -8633,7 +8633,7 @@ var getAutopoolUserActivity = async ({
         first: vars?.first || 1e3,
         skip: vars?.skip || 0
       }),
-      "userAutopoolBalanceChanges",
+      "userSpecificAutopoolBalanceChanges",
       {
         first: 1e3,
         maxPages: 100
@@ -8850,20 +8850,14 @@ var getAutopoolHistory = async (autopool) => {
       address: autopool?.poolAddress,
       timestamp: import_constants12.TOKEMAK_LAUNCH_TIMESTAMP
     });
-    const vaultId = autopool?.poolAddress.toLowerCase();
     const formattedData = autopoolDayDatas.map((dayData) => {
       return {
         ...dayData,
-        vaultId,
-        vault: {
-          id: vaultId
-        },
-        date: new Date(dayData.timestamp * 1e3),
-        baseAsset: autopool?.baseAsset
+        date: new Date(dayData.timestamp * 1e3)
       };
     });
     const filledData = fillMissingDates(formattedData);
-    return { [vaultId]: filledData };
+    return filledData;
   } catch (e) {
     console.log(e);
   }
@@ -8885,17 +8879,60 @@ var getAutopoolUserHistory = async ({
         timestamp: import_constants13.TOKEMAK_LAUNCH_TIMESTAMP,
         vaultAddress: autopool?.poolAddress
       });
-      const autopoolHistory = await getAutopoolHistory(autopool);
-      if (!autopoolHistory) {
+      const autopoolDayData = await getAutopoolHistory(autopool);
+      if (!autopoolDayData) {
         throw new Error("No autopool history found");
       }
-      const processedHistory = processUserHistory({
-        address: userAddress,
-        autopoolsHistory: autopoolHistory,
-        events: userActivity.events,
-        userHistory: userVaultDayDatas
+      const formattedUserVaultDayDatas = userVaultDayDatas.map((dayData) => {
+        if (!dayData.timestamp) {
+          throw new Error("Missing timestamp in userVaultDayData");
+        }
+        return {
+          ...dayData,
+          date: new Date(Number(dayData.timestamp) * 1e3),
+          timestamp: dayData.timestamp.toString()
+        };
+      });
+      const filledMissingDates = fillMissingDates(formattedUserVaultDayDatas);
+      if (filledMissingDates.length > 0) {
+        const firstEntry = filledMissingDates[0];
+        const dayBefore = new Date(firstEntry.date);
+        dayBefore.setDate(dayBefore.getDate() - 1);
+        const dayBeforeTimestamp = Math.floor(
+          dayBefore.getTime() / 1e3
+        ).toString();
+        const dayBeforeEntry = {
+          ...firstEntry,
+          date: dayBefore,
+          timestamp: dayBeforeTimestamp,
+          totalShares: 0
+        };
+        filledMissingDates.unshift(dayBeforeEntry);
+      }
+      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 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 windowEnd = userVaultDayData.date;
+          const matches = eventDate.getTime() > windowStart.getTime() && eventDate.getTime() <= windowEnd.getTime();
+          return matches;
+        });
+        return {
+          date: userVaultDayData.date,
+          timestamp: userVaultDayData.timestamp,
+          baseAsset: autopool?.baseAsset.symbol,
+          nav: userNav,
+          events: eventsForDay
+        };
       });
-      return processedHistory;
+      return matchedData;
     }
     return [];
   } catch (e) {

package/dist/index.d.ts

@@ -3318,42 +3318,28 @@ declare const getAutopoolUserHistory: ({ userAddress, autopool, userActivity, }:
     userAddress: Address;
     autopool: IAutopool;
     userActivity: IUserActivity;
-}) => Promise<EnhancedUserHistoryEntry[]>;
+}) => Promise<{
+    date: Date;
+    timestamp: any;
+    baseAsset: string;
+    nav: number;
+    events: {
+        timestamp: number;
+        shareChange: string;
+        assetChange: string;
+        vaultAddress: string;
+        eventType: EventType;
+    }[];
+}[]>;
 
 declare const getAutopoolHistory: (autopool: IAutopool) => Promise<{
-    [x: string]: {
-        vaultId: string;
-        vault: {
-            id: string;
-        };
-        date: Date;
-        baseAsset: {
-            price: number;
-            address: viem.Address;
-            chainId: number;
-            decimals: number;
-            logoURI: string;
-            name: string;
-            symbol: string;
-            audits?: string;
-            extensions?: {
-                bridgeMainnetAdapter?: viem.Address;
-                bridgeInfo?: {
-                    [chainId: number]: {
-                        tokenAddress: viem.Address;
-                    };
-                };
-                rebasing?: boolean;
-                parentAsset?: string;
-            };
-        };
-        __typename?: "AutopoolDayData";
-        totalSupply: any;
-        nav: any;
-        timestamp: any;
-        id: string;
-    }[];
-} | undefined>;
+    date: Date;
+    __typename?: "AutopoolDayData";
+    totalSupply: any;
+    nav: any;
+    timestamp: any;
+    id: string;
+}[] | undefined>;
 type IAutopoolHistory = Awaited<ReturnType<typeof getAutopoolHistory>>;
 
 export { AggregatedDayData, AutopoolCategory, AutopoolsApr, BASE_ASSETS, BATCH_SIZE, BaseAsset, BaseAssetWithUsd, BaseDataEntry, ChainAutopoolsAprResponse, ChainSTokeRewardsType, ChainSTokeType, ChainSTokeVotes, Currencies, CurveLP, ETH_BASE_ASSETS, EUR_BASE_ASSETS, EnhancedUserHistoryEntry, EventType, ExtraReward, FillData, GetLayerzeroStatusConfig, HistoricalTokenPrices, IAutopool, IAutopoolHistory, IAutopools, IAutopoolsHistory, IRebalance, IStoke, IStokeRewards, ISushiLP, ITopAutopoolHolder, ITopAutopoolHolders, IUserActivity, IUserAutopool, IUserAutopools, IUserAutopoolsRewards, IUserExtraRewards, IUserReward, LayerzeroStatus, MessageStatus, Order, PRICED_TOKENS, PoolRewardsBalanceDayData, QuoteAndPriceBaseConfig, QuoteAndPriceBaseResult, QuoteResult, RawRebalance, Reward, RewardDetails, STokeVotes, SendParam, SwapQuoteParams, SwapQuoteResponse, TokenPrices, USD_BASE_ASSETS, UserActivity, UserActivityTotalsType, UserAutopoolsVotes, UserDayDataEntry, UserSTokeVotes, VaultAddedMapping, aggregateSTokeRewardsDayData, arraysToObject, calculateRebalanceStats, convertBaseAssetToTokenPrices, convertBaseAssetToTokenPricesAndDenom, fetchChainDataMap, fetchChainRebalances, fillMissingDates, findClosestDateEntry, findClosestEntry, findClosestTimestampEntry, formatDateRange, getAddressFromSystemRegistry, getAllowance, getAmountDeposited, getAmountWithdrawn, getAutopilotRouter, getAutopoolCategory, getAutopoolDayData, getAutopoolHistory, getAutopoolInfo, getAutopoolRebalances, getAutopoolUser, getAutopoolUserActivity, getAutopoolUserHistory, getAutopools, getAutopoolsHistory, getAutopoolsRebalances, getBlobData, getBlobHistoricalTokenPrices, getBridgeFee, getChainAutopools, getChainAutopoolsApr, getChainCycleRolloverBlockNumber, getChainSToke, getChainSTokeRewards, getChainSubgraphStatus, getChainUserActivity, getChainUserAutopools, getChainUserSToke, getChainUserSTokeRewards, getChainUserSTokeVotes, getChainsForEnv, getCurrentCycleId, getCurveLP, getCycleV1, getDefillamaPrice, getDynamicSwap, getEthPrice, getEthPriceAtBlock, getExchangeNames, getGenStratAprs, getHistoricalTokenPrices, getLayerzeroStatus, getMutlipleAutopoolRebalances, getPoolStats, getPoolsAndDestinations, getPoolsAndDestinationsReturnType, getProtocolStats, getRebalanceStats, getRebalanceValueUsd, getRewardsPayloadV1, getSToke, getSTokeChainsForEnv, getSTokeRewards, getSTokeVotes, getSubgraphStatus, getSushiLP, getSwapQuote, getSystemConfig, getTimestampDaysFromStart, getTokePrice, getTokenList, getTokenPrice, getTokenPrices, getTopAutopoolHolders, getUserActivity, getUserAutoEthRewards, getUserAutopool, getUserAutopools, getUserAutopoolsHistory, getUserAutopoolsRewards, getUserCurveLP, getUserRewardsV1, getUserSToke, getUserSTokeVotes, getUserSushiLP, getUserTokenBalances, getUserV1, mergeArrays, mergeArraysWithKey, mergeStringArrays, minAmountDepositedBaseConfig, minAmountDepositedFunctionConfig, minAmountWithdrawnBaseConfig, minAmountWithdrawnFunctionConfig, modifyAutopoolName, nestedArrayToObject, paginateQuery, processRebalance, processRebalancesInBatches, rewardsData, systemRegistryFunctionNames, updateRebalanceStats, waitForMessageReceived };

package/dist/index.js

@@ -8592,7 +8592,7 @@ var getAutopoolUserActivity = async ({
         first: vars?.first || 1e3,
         skip: vars?.skip || 0
       }),
-      "userAutopoolBalanceChanges",
+      "userSpecificAutopoolBalanceChanges",
       {
         first: 1e3,
         maxPages: 100
@@ -8813,20 +8813,14 @@ var getAutopoolHistory = async (autopool) => {
       address: autopool?.poolAddress,
       timestamp: TOKEMAK_LAUNCH_TIMESTAMP3
     });
-    const vaultId = autopool?.poolAddress.toLowerCase();
     const formattedData = autopoolDayDatas.map((dayData) => {
       return {
         ...dayData,
-        vaultId,
-        vault: {
-          id: vaultId
-        },
-        date: new Date(dayData.timestamp * 1e3),
-        baseAsset: autopool?.baseAsset
+        date: new Date(dayData.timestamp * 1e3)
       };
     });
     const filledData = fillMissingDates(formattedData);
-    return { [vaultId]: filledData };
+    return filledData;
   } catch (e) {
     console.log(e);
   }
@@ -8848,17 +8842,60 @@ var getAutopoolUserHistory = async ({
         timestamp: TOKEMAK_LAUNCH_TIMESTAMP4,
         vaultAddress: autopool?.poolAddress
       });
-      const autopoolHistory = await getAutopoolHistory(autopool);
-      if (!autopoolHistory) {
+      const autopoolDayData = await getAutopoolHistory(autopool);
+      if (!autopoolDayData) {
         throw new Error("No autopool history found");
       }
-      const processedHistory = processUserHistory({
-        address: userAddress,
-        autopoolsHistory: autopoolHistory,
-        events: userActivity.events,
-        userHistory: userVaultDayDatas
+      const formattedUserVaultDayDatas = userVaultDayDatas.map((dayData) => {
+        if (!dayData.timestamp) {
+          throw new Error("Missing timestamp in userVaultDayData");
+        }
+        return {
+          ...dayData,
+          date: new Date(Number(dayData.timestamp) * 1e3),
+          timestamp: dayData.timestamp.toString()
+        };
+      });
+      const filledMissingDates = fillMissingDates(formattedUserVaultDayDatas);
+      if (filledMissingDates.length > 0) {
+        const firstEntry = filledMissingDates[0];
+        const dayBefore = new Date(firstEntry.date);
+        dayBefore.setDate(dayBefore.getDate() - 1);
+        const dayBeforeTimestamp = Math.floor(
+          dayBefore.getTime() / 1e3
+        ).toString();
+        const dayBeforeEntry = {
+          ...firstEntry,
+          date: dayBefore,
+          timestamp: dayBeforeTimestamp,
+          totalShares: 0
+        };
+        filledMissingDates.unshift(dayBeforeEntry);
+      }
+      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 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 windowEnd = userVaultDayData.date;
+          const matches = eventDate.getTime() > windowStart.getTime() && eventDate.getTime() <= windowEnd.getTime();
+          return matches;
+        });
+        return {
+          date: userVaultDayData.date,
+          timestamp: userVaultDayData.timestamp,
+          baseAsset: autopool?.baseAsset.symbol,
+          nav: userNav,
+          events: eventsForDay
+        };
       });
-      return processedHistory;
+      return matchedData;
     }
     return [];
   } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokemak/queries",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -26,10 +26,10 @@
     "@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/graph-cli": "0.0.9",
     "@tokemak/tokenlist": "0.0.3",
-    "@tokemak/constants": "0.0.4",
     "@tokemak/utils": "0.0.5"
   },
   "scripts": {