@tokemak/queries 0.0.12 → 0.0.13

package/dist/index.d.ts

@@ -591,7 +591,8 @@ declare const getChainAutopools: (wagmiConfig: Config, { chainId, prices, }: {
     symbol: string;
     logoURI?: string | undefined;
     description?: string;
-    type?: "Core" | "Ecosystem" | "Institutional" | undefined;
+    type?: "Ecosystem" | "Institutional" | "Flagship" | undefined;
+    inactive?: boolean;
     tvl: number;
     totalAssets: {
         denom: number;
@@ -702,6 +703,7 @@ declare const getChainAutopools: (wagmiConfig: Config, { chainId, prices, }: {
             id: any;
         } | null;
     }[] | null | undefined;
+    autopoolRewarderDisabled: boolean;
     createdAt: Date;
     baseAsset: {
         price: number;
@@ -800,11 +802,9 @@ declare const getChainAutopools: (wagmiConfig: Config, { chainId, prices, }: {
     }[];
     chain: _tokemak_tokenlist.INetwork | undefined;
     apr: {
-        base: any;
-        boosted: number;
+        base: number;
         extraAprs: ExtraReward[];
-        combined: any;
-        hasBoostedApr: boolean;
+        combined: number;
         hasExtraAprs: boolean;
     };
     dailyEarnings: {
@@ -983,7 +983,8 @@ declare const getAutopools: (wagmiConfig: Config$1, { prices, includeTestnet, }:
     symbol: string;
     logoURI?: string | undefined;
     description?: string;
-    type?: "Core" | "Ecosystem" | "Institutional" | undefined;
+    type?: "Ecosystem" | "Institutional" | "Flagship" | undefined;
+    inactive?: boolean;
     tvl: number;
     totalAssets: {
         denom: number;
@@ -1094,6 +1095,7 @@ declare const getAutopools: (wagmiConfig: Config$1, { prices, includeTestnet, }:
             id: any;
         } | null;
     }[] | null | undefined;
+    autopoolRewarderDisabled: boolean;
     createdAt: Date;
     baseAsset: {
         price: number;
@@ -1192,11 +1194,9 @@ declare const getAutopools: (wagmiConfig: Config$1, { prices, includeTestnet, }:
     }[];
     chain: _tokemak_tokenlist.INetwork | undefined;
     apr: {
-        base: any;
-        boosted: number;
+        base: number;
         extraAprs: ExtraReward[];
-        combined: any;
-        hasBoostedApr: boolean;
+        combined: number;
         hasExtraAprs: boolean;
     };
     dailyEarnings: {
@@ -1694,15 +1694,17 @@ type UserActivityTotalsType = {
         chainId: SupportedChainIds;
     };
 };
+type EventType = "Deposit" | "Withdrawal" | "Stake" | "Unstake" | "Unknown";
 declare const getChainUserActivity: (address?: Address, chainId?: SupportedChainIds) => Promise<{
     events: {
         timestamp: number;
         shareChange: string;
         assetChange: string;
         vaultAddress: string;
+        eventType: EventType;
     }[];
     totals: UserActivityTotalsType;
-} | undefined>;
+}>;
 
 type IUserReward = {
     payload: {
@@ -2307,7 +2309,6 @@ declare const getUserAutopools: ({ address, includeTestnet, autopools, userActiv
             nav: Currencies;
         };
         useDenomination: boolean;
-        baseApr: any;
         blendedApr: number;
         rewardsClaimed: any;
         lastDeposit: string | undefined;
@@ -3053,6 +3054,8 @@ type IRebalance = {
     blockNumber: number;
     chainId: number;
     valueInUsd: number;
+    valueInAsset: number;
+    autopool: string;
 };
 type RawRebalance = {
     timestamp: number;
@@ -3064,6 +3067,7 @@ type RawRebalance = {
     };
     tokenOutValueInEth: string;
     tokenOutValueBaseAsset: string;
+    autopool: string;
 };
 declare const fetchChainRebalances: (chainId: number) => Promise<RawRebalance[]>;
 declare const getRebalanceValueUsd: (rebalance: RawRebalance, chainId: number, wagmiConfig: Config$1) => Promise<number | null>;
@@ -3093,4 +3097,53 @@ declare const updateRebalanceStats: (wagmiConfig: Config$1, { currentRebalances,
     rebalances: IRebalance[];
 }>;
 
-export { AggregatedDayData, AutopoolCategory, BASE_ASSETS, BATCH_SIZE, BaseAsset, BaseDataEntry, ChainSTokeRewardsType, ChainSTokeType, ChainSTokeVotes, Currencies, CurveLP, ETH_BASE_ASSETS, EUR_BASE_ASSETS, EnhancedUserHistoryEntry, ExtraReward, FillData, GetLayerzeroStatusConfig, IAutopool, IAutopools, IAutopoolsHistory, IRebalance, IStoke, IStokeRewards, ISushiLP, ITopAutopoolHolder, ITopAutopoolHolders, IUserActivity, IUserAutopool, IUserAutopools, IUserAutopoolsRewards, IUserExtraRewards, IUserReward, LayerzeroStatus, MessageStatus, Order, PRICED_TOKENS, PoolRewardsBalanceDayData, QuoteAndPriceBaseConfig, QuoteAndPriceBaseResult, QuoteResult, RawRebalance, STokeVotes, SendParam, SwapQuoteParams, SwapQuoteResponse, TokenPrices, USD_BASE_ASSETS, UserActivity, UserAutopoolsVotes, UserDayDataEntry, UserSTokeVotes, VaultAddedMapping, aggregateSTokeRewardsDayData, arraysToObject, calculateRebalanceStats, convertBaseAssetToTokenPrices, convertBaseAssetToTokenPricesAndDenom, fetchChainDataMap, fetchChainRebalances, fillMissingDates, findClosestDateEntry, findClosestEntry, findClosestTimestampEntry, formatDateRange, getAddressFromSystemRegistry, getAllowance, getAmountDeposited, getAmountWithdrawn, getAutopilotRouter, getAutopoolCategory, getAutopoolDayData, getAutopoolInfo, getAutopoolRebalances, getAutopools, getAutopoolsHistory, getAutopoolsRebalances, getBridgeFee, getChainAutopools, getChainCycleRolloverBlockNumber, getChainSToke, getChainSTokeRewards, getChainSubgraphStatus, getChainUserActivity, getChainUserAutopools, getChainUserSToke, getChainUserSTokeRewards, getChainUserSTokeVotes, getChainsForEnv, getCurrentCycleId, getCurveLP, getCycleV1, getDefillamaPrice, getDynamicSwap, getEthPrice, getEthPriceAtBlock, getExchangeNames, getGenStratAprs, 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 };
+type BaseAssetWithUsd = BaseAsset | "USD";
+type HistoricalPriceEntry = {
+    timestamp: number;
+    date: Date;
+    price: string;
+};
+declare const getBlobHistoricalTokenPrices: (tokenSymbol: string) => Promise<HistoricalPriceEntry[]>;
+declare const getHistoricalTokenPrices: () => Promise<HistoricalTokenPrices[]>;
+type HistoricalTokenPrices = {
+    timestamp: number;
+    date: Date;
+    prices: {
+        [key in BaseAssetWithUsd]: {
+            [key in BaseAssetWithUsd]: number;
+        };
+    };
+};
+
+interface RewardDetails {
+    rewarderAddress: Address;
+}
+interface Reward {
+    rewardApy: number;
+    rewardSource: string;
+    rewardToken: Address;
+    rewardTokenSymbol: string;
+    details: RewardDetails;
+}
+interface AutopoolsApr {
+    id: Address;
+    symbol: string;
+    name: string;
+    baseAssetId: Address;
+    baseAssetSymbol: string;
+    autopoolRewarderDisabled: boolean;
+    baseApy: number;
+    tvlUsd: number;
+    rewards: Reward[];
+}
+interface ChainAutopoolsAprResponse {
+    chainId: string;
+    timestamp: string;
+    processedCount: number;
+    autopools: AutopoolsApr[];
+}
+declare const getChainAutopoolsApr: (chainId: number) => Promise<ChainAutopoolsAprResponse | undefined>;
+
+declare const getBlobData: (blobName: string) => Promise<any>;
+
+export { AggregatedDayData, AutopoolCategory, AutopoolsApr, BASE_ASSETS, BATCH_SIZE, BaseAsset, BaseAssetWithUsd, BaseDataEntry, ChainAutopoolsAprResponse, ChainSTokeRewardsType, ChainSTokeType, ChainSTokeVotes, Currencies, CurveLP, ETH_BASE_ASSETS, EUR_BASE_ASSETS, EnhancedUserHistoryEntry, ExtraReward, FillData, GetLayerzeroStatusConfig, HistoricalTokenPrices, IAutopool, 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, UserAutopoolsVotes, UserDayDataEntry, UserSTokeVotes, VaultAddedMapping, aggregateSTokeRewardsDayData, arraysToObject, calculateRebalanceStats, convertBaseAssetToTokenPrices, convertBaseAssetToTokenPricesAndDenom, fetchChainDataMap, fetchChainRebalances, fillMissingDates, findClosestDateEntry, findClosestEntry, findClosestTimestampEntry, formatDateRange, getAddressFromSystemRegistry, getAllowance, getAmountDeposited, getAmountWithdrawn, getAutopilotRouter, getAutopoolCategory, getAutopoolDayData, getAutopoolInfo, getAutopoolRebalances, 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

@@ -3629,7 +3629,7 @@ import {
   getProtocol,
   getToken
 } from "@tokemak/utils";
-import { formatUnits as formatUnits2, getAddress } from "viem";
+import { getAddress } from "viem";
 
 // constants/tokenOrders.ts
 var UITokenOrder = [
@@ -3701,6 +3701,28 @@ var getGenStratAprs = async ({
   }
 };
 
+// functions/getChainAutopoolsApr.ts
+import { AUTOPOOLS_APR_URL } from "@tokemak/constants";
+var getChainAutopoolsApr = async (chainId) => {
+  try {
+    const response = await fetch(`${AUTOPOOLS_APR_URL}/${chainId}/gen3`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Failed to fetch getChainAutopoolsApr: ${response.status}`
+      );
+    }
+    return await response.json();
+  } catch (e) {
+    console.error("Failed to fetch getChainAutopoolsApr:", e);
+    return void 0;
+  }
+};
+
 // functions/getChainAutopools.ts
 import {
   ALL_TOKENS,
@@ -3768,8 +3790,10 @@ var getChainAutopools = async (wagmiConfig, {
   const { GetVaultAddeds, GetAutopoolsInactiveDestinations } = getSdkByChainId(chainId);
   try {
     const { vaultAddeds } = await GetVaultAddeds();
+    const autopoolsAprResponse = await getChainAutopoolsApr(chainId);
+    const autopoolsApr = autopoolsAprResponse?.autopools || [];
     const { GetAutopoolsApr } = getSdkByChainId(chainId);
-    const { autopools: autopoolsApr } = await GetAutopoolsApr();
+    const { autopools: autopoolsDenomination } = await GetAutopoolsApr();
     const genStratAprs = await getGenStratAprs({
       chainId
     });
@@ -3939,35 +3963,9 @@ var getChainAutopools = async (wagmiConfig, {
         const aprs = autopoolsApr.find(
           (autopoolApr) => getAddress(autopoolApr.id) === getAddress(autopool.poolAddress)
         );
-        let baseApr = aprs?.currentApy;
-        let boostedApr = 0;
+        let baseApr = aprs?.baseApy !== void 0 ? aprs.baseApy / 100 : void 0;
         let extraApr = 0;
-        const formattedRewarder7DayMAApy = formatEtherNum2(
-          BigInt(Number(aprs?.rewarder?.day7MAApy) || 0)
-        );
-        const formattedRewarder30DayMAApy = formatEtherNum2(
-          BigInt(Number(aprs?.rewarder?.day30MAApy) || 0)
-        );
-        if (formattedRewarder7DayMAApy > 0) {
-          boostedApr = formattedRewarder7DayMAApy;
-        }
-        if (formattedRewarder30DayMAApy > 0) {
-          boostedApr = formattedRewarder30DayMAApy;
-        }
-        if (!baseApr) {
-          const weightedCrNum = destinations.reduce((acc, cur) => {
-            return acc + cur.debtValueHeldByVaultAllocation * cur.compositeReturn;
-          }, 0);
-          const periodicFeeBps = autopool.periodicFeeBps || 0n;
-          const streamingFeeBps = autopool.streamingFeeBps || 0n;
-          baseApr = (weightedCrNum / (1 - totalIdleAssets / totalAssets) - Number(formatUnits2(periodicFeeBps, 4))) * (1 - Number(formatUnits2(streamingFeeBps, 4)));
-        } else {
-          baseApr = Number(formatUnits2(BigInt(baseApr), baseAsset.decimals));
-        }
-        if (!baseApr) {
-          baseApr = 0;
-        }
-        if (baseApr === 0) {
+        if (baseApr === void 0) {
           try {
             const backupApr = await getBackupApr(chainId, autopool.poolAddress);
             if (backupApr) {
@@ -3979,27 +3977,26 @@ var getChainAutopools = async (wagmiConfig, {
             console.log("unable to retrieve backup apr");
           }
         }
-        if (baseApr === 0 && autopool.symbol.toLowerCase() === "baseusd") {
-          baseApr = 0.0914;
-        }
         let extraRewards = [];
-        if (aprs?.rewarder?.extraRewarders?.length && aprs?.rewarder?.extraRewarders?.length > 0) {
-          extraRewards = aprs?.rewarder?.extraRewarders.map((reward) => {
-            const token = getToken(reward?.rewardToken?.id, chainId);
+        if (aprs?.rewards && aprs.rewards.length > 0) {
+          extraRewards = aprs.rewards.map((reward) => {
+            const token = getToken(reward.rewardToken, chainId);
             return {
               ...token,
-              apr: formatEtherNum2(BigInt(reward.currentApy || 0))
+              apr: reward.rewardApy / 100
             };
           });
         }
-        if (autopool?.symbol?.toLowerCase() === "plasmausd") {
-          boostedApr = 0;
-        }
         extraApr = extraRewards.reduce((acc, reward) => acc + reward.apr, 0);
-        const combinedApr = baseApr + boostedApr + extraApr;
+        if (baseApr === void 0)
+          baseApr = 0;
+        const combinedApr = baseApr + extraApr;
         let denominatedToken = ETH_TOKEN;
         let useDenominatedValues = false;
-        const denominatedIn = aprs?.denominatedIn;
+        const denominationData = autopoolsDenomination.find(
+          (autopoolDenom) => getAddress(autopoolDenom.id) === getAddress(autopool.poolAddress)
+        );
+        const denominatedIn = denominationData?.denominatedIn;
         if (denominatedIn?.symbol?.toLowerCase() === "weth") {
           denominatedToken = ETH_TOKEN;
         } else {
@@ -4140,7 +4137,8 @@ var getChainAutopools = async (wagmiConfig, {
           exchanges: groupedExchanges,
           timestamp,
           isNew,
-          extraRewarders: aprs?.rewarder?.extraRewarders,
+          extraRewarders: denominationData?.rewarder?.extraRewarders,
+          autopoolRewarderDisabled: aprs?.autopoolRewarderDisabled ?? false,
           createdAt: new Date(timestamp * 1e3),
           baseAsset: {
             ...baseAsset,
@@ -4158,10 +4156,8 @@ var getChainAutopools = async (wagmiConfig, {
           chain: getNetwork3(chainId),
           apr: {
             base: baseApr,
-            boosted: boostedApr,
             extraAprs: extraRewards,
             combined: combinedApr,
-            hasBoostedApr: boostedApr > 1e-4,
             hasExtraAprs: extraRewards.length > 0
           },
           dailyEarnings: {
@@ -4421,9 +4417,18 @@ import { getSdkByChainId as getSdkByChainId5 } from "@tokemak/graph-cli";
 var getChainUserActivity = async (address, chainId = 1) => {
   const { GetUserBalanceChangeHistory } = getSdkByChainId5(chainId);
   try {
-    const { userAutopoolBalanceChanges } = await GetUserBalanceChangeHistory({
-      userAddress: address
-    });
+    const userAutopoolBalanceChanges = await paginateQuery(
+      (vars) => GetUserBalanceChangeHistory({
+        userAddress: address,
+        first: vars?.first || 1e3,
+        skip: vars?.skip || 0
+      }),
+      "userAutopoolBalanceChanges",
+      {
+        first: 1e3,
+        maxPages: 100
+      }
+    );
     let userActivityTotals = {};
     let events = [];
     userAutopoolBalanceChanges.forEach((activity) => {
@@ -4437,29 +4442,37 @@ var getChainUserActivity = async (address, chainId = 1) => {
         };
       }
       activity.items.forEach((item) => {
+        let eventType;
         if (item.staked && item.assetChange > 0n) {
           userActivityTotals[activity.vaultAddress].totalStakes += BigInt(
             item.assetChange
           );
+          eventType = "Stake";
         } else if (item.staked && item.assetChange < 0n) {
           userActivityTotals[activity.vaultAddress].totalUnstakes += BigInt(
             BigInt(item.assetChange) * -1n
           );
+          eventType = "Unstake";
         } else if (!item.staked && item.assetChange > 0n) {
           userActivityTotals[activity.vaultAddress].totalDeposits += BigInt(
             item.assetChange
           );
+          eventType = "Deposit";
         } else if (!item.staked && item.assetChange < 0n) {
           userActivityTotals[activity.vaultAddress].totalWithdrawals += BigInt(
             BigInt(item.assetChange) * -1n
           );
+          eventType = "Withdrawal";
+        } else {
+          eventType = "Unknown";
         }
         if (!item.staked) {
           events.push({
             timestamp: activity.timestamp,
             shareChange: item.shareChange,
             assetChange: item.assetChange,
-            vaultAddress: activity.vaultAddress
+            vaultAddress: activity.vaultAddress,
+            eventType
             // staked: item.staked,
           });
         }
@@ -4468,6 +4481,7 @@ var getChainUserActivity = async (address, chainId = 1) => {
     return { events, totals: userActivityTotals };
   } catch (e) {
     console.log(e);
+    return { events: [], totals: {} };
   }
 };
 
@@ -4715,17 +4729,17 @@ var getUserV1 = async (wagmiConfig, {
 
 // functions/getChainUserAutopoolsHistory.tsx
 import { getSdkByChainId as getSdkByChainId6 } from "@tokemak/graph-cli";
+import { TOKEMAK_LAUNCH_TIMESTAMP } from "@tokemak/constants";
 var getChainUserAutopoolsHistory = async ({
   address,
   chainId = 1
 }) => {
   const { GetUserVaultsDayData } = getSdkByChainId6(chainId);
-  const oneYearAgoTimestamp = Math.floor(Date.now() / 1e3) - 365 * 24 * 60 * 60;
   try {
     if (address) {
       const { userVaultDayDatas } = await GetUserVaultsDayData({
         address,
-        timestamp: oneYearAgoTimestamp
+        timestamp: TOKEMAK_LAUNCH_TIMESTAMP
       });
       return userVaultDayDatas;
     }
@@ -4739,7 +4753,6 @@ var getChainUserAutopoolsHistory = async ({
 // functions/getUserAutopoolsHistory.ts
 import {
   formatDateToReadable as formatDateToReadable2,
-  formatEtherNum as formatEtherNum3,
   formatUnitsNum as formatUnitsNum2
 } from "@tokemak/utils";
 
@@ -5025,10 +5038,8 @@ var getUserAutopoolsHistory = async (address, autopoolsHistory, events, includeT
         const userHistory2 = filledDataByVault[vaultId];
         userHistory2.sort((a, b) => a.date.getTime() - b.date.getTime());
         const mergedData = autopoolHistory.reduce((result2, dayData) => {
-          const userHistoryData = findClosestDateEntry(
-            userHistory2,
-            dayData.date,
-            ONE_DAY_IN_MS
+          const userHistoryData = userHistory2.find(
+            (userHistory3) => userHistory3.date.toDateString() === dayData.date.toDateString()
           );
           if (userHistoryData) {
             const DECIMALS = BigInt(dayData.baseAsset.decimals);
@@ -5141,12 +5152,28 @@ var getUserAutopoolsHistory = async (address, autopoolsHistory, events, includeT
     (dayData) => {
       const eventsForDay = events?.filter((event) => {
         const eventDate = new Date(Number(event.timestamp) * 1e3);
-        return eventDate.getTime() >= dayData.date.getTime() && eventDate.getTime() < dayData.date.getTime() + 24 * 60 * 60 * 1e3;
+        const windowStart = new Date(
+          dayData.date.getTime() - 24 * 60 * 60 * 1e3
+        );
+        const windowEnd = dayData.date;
+        const matches = eventDate.getTime() > windowStart.getTime() && eventDate.getTime() <= windowEnd.getTime();
+        return matches;
       });
-      const differential = eventsForDay.reduce(
-        (sum, event) => sum + formatEtherNum3(BigInt(event?.assetChange || 0n)),
-        0
-      );
+      const differential = eventsForDay.reduce((sum, event) => {
+        const vault = dayData.autopools.find(
+          (autopool) => autopool.vaultAddress.toLowerCase() === event.vaultAddress.toLowerCase()
+        );
+        if (!vault) {
+          console.warn("Event for unknown vault:", event.vaultAddress);
+          return sum;
+        }
+        const decimals = vault.baseAsset.decimals;
+        const assetChangeNum = formatUnitsNum2(
+          BigInt(event.assetChange || 0n),
+          decimals
+        );
+        return sum + assetChangeNum;
+      }, 0);
       return {
         ...dayData,
         events: eventsForDay,
@@ -5325,9 +5352,9 @@ var getMutlipleAutopoolRebalances = async (ids, chainId = 1) => {
 // functions/getAutopoolDayData.ts
 import { formatUnits as formatUnits4 } from "viem";
 import { formatEtherNum as formatEtherNum4 } from "@tokemak/utils";
-import { TOKEMAK_LAUNCH_TIMESTAMP } from "@tokemak/constants";
+import { TOKEMAK_LAUNCH_TIMESTAMP as TOKEMAK_LAUNCH_TIMESTAMP2 } from "@tokemak/constants";
 import { getSdkByChainId as getSdkByChainId9 } from "@tokemak/graph-cli";
-var getAutopoolDayData = async (address, chainId = 1, startTimestamp = TOKEMAK_LAUNCH_TIMESTAMP) => {
+var getAutopoolDayData = async (address, chainId = 1, startTimestamp = TOKEMAK_LAUNCH_TIMESTAMP2) => {
   try {
     const { GetAutopoolDayData } = getSdkByChainId9(chainId);
     const { autopoolDayDatas } = await GetAutopoolDayData({
@@ -5775,10 +5802,7 @@ var getUserAutopools = async ({
           );
           const stakedRatio = stakedShares / userShares;
           const unstakedRatio = 1 - stakedRatio;
-          const isSilo = autopoolData?.symbol === "siloETH" || autopoolData?.symbol === "siloUSD";
-          const baseApr = autopoolData?.apr?.base ?? 0;
-          const stakedAprForBlend = isSilo ? baseApr : autopoolData?.apr?.combined ?? 0;
-          const blendedApr = stakedRatio * stakedAprForBlend + unstakedRatio * baseApr;
+          const blendedApr = stakedRatio * autopoolData?.apr?.combined + unstakedRatio * autopoolData?.apr?.base;
           return {
             name: autopoolData?.name,
             symbol: autopoolData?.symbol,
@@ -5801,7 +5825,6 @@ var getUserAutopools = async ({
               nav: unstaked
             },
             useDenomination: autopoolData?.useDenomination,
-            baseApr,
             blendedApr,
             rewardsClaimed: userAutopool?.rewardsClaimed,
             lastDeposit,
@@ -6425,7 +6448,8 @@ var getDynamicSwap = async ({
         body: JSON.stringify({
           chainId,
           systemName: "gen3",
-          slippageBps: Math.floor(slippage * 1e4),
+          // slippageBps: Math.floor(slippage * 10000),
+          slippageBps: 2e3,
           tokensToLiquidate,
           sellAllOnlyCompatible: true
         })
@@ -8424,6 +8448,13 @@ var getRebalanceValueUsd = async (rebalance, chainId, wagmiConfig) => {
   }
 };
 var processRebalance = async (rebalance, chainId, wagmiConfig) => {
+  const baseDecimals = inferBaseAssetDecimals(rebalance, chainId);
+  const baseAssetAmount = Number(
+    formatUnitsNum5(
+      BigInt(rebalance.tokenOutValueBaseAsset || "0"),
+      baseDecimals
+    )
+  );
   const ethPathUsd = await getRebalanceValueUsd(
     rebalance,
     chainId,
@@ -8431,24 +8462,21 @@ var processRebalance = async (rebalance, chainId, wagmiConfig) => {
   );
   if (ethPathUsd != null) {
     return {
+      autopool: rebalance.autopool,
       timestamp: rebalance.timestamp,
       blockNumber: rebalance.blockNumber,
       chainId,
-      valueInUsd: ethPathUsd
+      valueInUsd: ethPathUsd,
+      valueInAsset: baseAssetAmount
     };
   }
-  const baseDecimals = inferBaseAssetDecimals(rebalance, chainId);
-  const baseUsd = Number(
-    formatUnitsNum5(
-      BigInt(rebalance.tokenOutValueBaseAsset || "0"),
-      baseDecimals
-    )
-  );
   return {
+    autopool: rebalance.autopool,
     timestamp: rebalance.timestamp,
     blockNumber: rebalance.blockNumber,
     chainId,
-    valueInUsd: baseUsd
+    valueInUsd: baseAssetAmount,
+    valueInAsset: baseAssetAmount
   };
 };
 var processRebalancesInBatches = async (rebalances, chainId, wagmiConfig) => {
@@ -8560,8 +8588,11 @@ export {
   getAutopools,
   getAutopoolsHistory,
   getAutopoolsRebalances,
+  getBlobData,
+  getBlobHistoricalTokenPrices,
   getBridgeFee,
   getChainAutopools,
+  getChainAutopoolsApr,
   getChainCycleRolloverBlockNumber,
   getChainSToke,
   getChainSTokeRewards,
@@ -8581,6 +8612,7 @@ export {
   getEthPriceAtBlock,
   getExchangeNames,
   getGenStratAprs,
+  getHistoricalTokenPrices,
   getLayerzeroStatus,
   getMutlipleAutopoolRebalances,
   getPoolStats,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokemak/queries",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,16 +21,16 @@
   },
   "type": "module",
   "dependencies": {
+    "@tokemak/autopilot-swap-route-calc": "0.0.7",
+    "viem": "2.x",
+    "@wagmi/core": "2.x",
+    "wagmi": "2.x",
     "@tokemak/abis": "0.0.3",
-    "@tokemak/config": "0.0.4",
     "@tokemak/constants": "0.0.4",
     "@tokemak/graph-cli": "0.0.5",
+    "@tokemak/config": "0.0.4",
     "@tokemak/tokenlist": "0.0.3",
-    "@tokemak/utils": "0.0.5",
-    "@tokemak/autopilot-swap-route-calc": "0.0.7",
-    "viem": "2.x",
-    "@wagmi/core": "2.x",
-    "wagmi": "2.x"
+    "@tokemak/utils": "0.0.5"
   },
   "scripts": {
     "build": "tsup",