@tokemak/queries 0.0.12 → 0.0.13

package/dist/index.cjs

@@ -3147,8 +3147,11 @@ __export(queries_exports, {
   getAutopools: () => getAutopools,
   getAutopoolsHistory: () => getAutopoolsHistory,
   getAutopoolsRebalances: () => getAutopoolsRebalances,
+  getBlobData: () => getBlobData,
+  getBlobHistoricalTokenPrices: () => getBlobHistoricalTokenPrices,
   getBridgeFee: () => getBridgeFee,
   getChainAutopools: () => getChainAutopools,
+  getChainAutopoolsApr: () => getChainAutopoolsApr,
   getChainCycleRolloverBlockNumber: () => getChainCycleRolloverBlockNumber,
   getChainSToke: () => getChainSToke,
   getChainSTokeRewards: () => getChainSTokeRewards,
@@ -3168,6 +3171,7 @@ __export(queries_exports, {
   getEthPriceAtBlock: () => getEthPriceAtBlock,
   getExchangeNames: () => getExchangeNames,
   getGenStratAprs: () => getGenStratAprs,
+  getHistoricalTokenPrices: () => getHistoricalTokenPrices,
   getLayerzeroStatus: () => getLayerzeroStatus,
   getMutlipleAutopoolRebalances: () => getMutlipleAutopoolRebalances,
   getPoolStats: () => getPoolStats,
@@ -3788,6 +3792,28 @@ var getGenStratAprs = async ({
   }
 };
 
+// functions/getChainAutopoolsApr.ts
+var import_constants5 = require("@tokemak/constants");
+var getChainAutopoolsApr = async (chainId) => {
+  try {
+    const response = await fetch(`${import_constants5.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
 var import_tokenlist3 = require("@tokemak/tokenlist");
 var import_graph_cli = require("@tokemak/graph-cli");
@@ -3846,8 +3872,10 @@ var getChainAutopools = async (wagmiConfig, {
   const { GetVaultAddeds, GetAutopoolsInactiveDestinations } = (0, import_graph_cli.getSdkByChainId)(chainId);
   try {
     const { vaultAddeds } = await GetVaultAddeds();
+    const autopoolsAprResponse = await getChainAutopoolsApr(chainId);
+    const autopoolsApr = autopoolsAprResponse?.autopools || [];
     const { GetAutopoolsApr } = (0, import_graph_cli.getSdkByChainId)(chainId);
-    const { autopools: autopoolsApr } = await GetAutopoolsApr();
+    const { autopools: autopoolsDenomination } = await GetAutopoolsApr();
     const genStratAprs = await getGenStratAprs({
       chainId
     });
@@ -4017,35 +4045,9 @@ var getChainAutopools = async (wagmiConfig, {
         const aprs = autopoolsApr.find(
           (autopoolApr) => (0, import_viem2.getAddress)(autopoolApr.id) === (0, import_viem2.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 = (0, import_utils6.formatEtherNum)(
-          BigInt(Number(aprs?.rewarder?.day7MAApy) || 0)
-        );
-        const formattedRewarder30DayMAApy = (0, import_utils6.formatEtherNum)(
-          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((0, import_viem2.formatUnits)(periodicFeeBps, 4))) * (1 - Number((0, import_viem2.formatUnits)(streamingFeeBps, 4)));
-        } else {
-          baseApr = Number((0, import_viem2.formatUnits)(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) {
@@ -4057,27 +4059,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 = (0, import_utils6.getToken)(reward?.rewardToken?.id, chainId);
+        if (aprs?.rewards && aprs.rewards.length > 0) {
+          extraRewards = aprs.rewards.map((reward) => {
+            const token = (0, import_utils6.getToken)(reward.rewardToken, chainId);
             return {
               ...token,
-              apr: (0, import_utils6.formatEtherNum)(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 = import_tokenlist3.ETH_TOKEN;
         let useDenominatedValues = false;
-        const denominatedIn = aprs?.denominatedIn;
+        const denominationData = autopoolsDenomination.find(
+          (autopoolDenom) => (0, import_viem2.getAddress)(autopoolDenom.id) === (0, import_viem2.getAddress)(autopool.poolAddress)
+        );
+        const denominatedIn = denominationData?.denominatedIn;
         if (denominatedIn?.symbol?.toLowerCase() === "weth") {
           denominatedToken = import_tokenlist3.ETH_TOKEN;
         } else {
@@ -4218,7 +4219,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,
@@ -4236,10 +4238,8 @@ var getChainAutopools = async (wagmiConfig, {
           chain: (0, import_utils6.getNetwork)(chainId),
           apr: {
             base: baseApr,
-            boosted: boostedApr,
             extraAprs: extraRewards,
             combined: combinedApr,
-            hasBoostedApr: boostedApr > 1e-4,
             hasExtraAprs: extraRewards.length > 0
           },
           dailyEarnings: {
@@ -4408,7 +4408,7 @@ var getAutopoolsHistory = async (autopools, days, includeTestnet = false) => {
 
 // functions/getCurveLP.ts
 var import_config3 = require("@tokemak/config");
-var import_constants5 = require("@tokemak/constants");
+var import_constants6 = require("@tokemak/constants");
 var getCurveLP = async () => {
   let curveData;
   const { curveRewardsUrl } = (0, import_config3.getMainnetConfig)();
@@ -4425,10 +4425,10 @@ var getCurveLP = async () => {
     console.error(e);
   }
   try {
-    const curvePoolsResponse = await fetch(import_constants5.CURVE_API_URL);
+    const curvePoolsResponse = await fetch(import_constants6.CURVE_API_URL);
     const curvePoolsData = await curvePoolsResponse.json();
     const curveTOKEPool = curvePoolsData?.data?.poolData.find(
-      (pool) => pool.id === import_constants5.TOKE_CURVE_POOL_ID
+      (pool) => pool.id === import_constants6.TOKE_CURVE_POOL_ID
     );
     if (curveData) {
       curveData.curveTvl = curveTOKEPool?.usdTotal;
@@ -4499,9 +4499,18 @@ var import_graph_cli5 = require("@tokemak/graph-cli");
 var getChainUserActivity = async (address, chainId = 1) => {
   const { GetUserBalanceChangeHistory } = (0, import_graph_cli5.getSdkByChainId)(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) => {
@@ -4515,29 +4524,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,
           });
         }
@@ -4546,6 +4563,7 @@ var getChainUserActivity = async (address, chainId = 1) => {
     return { events, totals: userActivityTotals };
   } catch (e) {
     console.log(e);
+    return { events: [], totals: {} };
   }
 };
 
@@ -4568,7 +4586,7 @@ var getRewardsPayloadV1 = async (cycleHash, account, rewardsV1Url) => {
 // functions/getUserAutoEthRewards.ts
 var import_abis3 = require("@tokemak/abis");
 var import_core3 = require("@wagmi/core");
-var import_utils10 = require("@tokemak/utils");
+var import_utils11 = require("@tokemak/utils");
 var getAutoEthRewards = async (wagmiConfig, {
   account,
   currentCycleIndex,
@@ -4606,7 +4624,7 @@ var getAutoEthRewards = async (wagmiConfig, {
     const currentAmount = Number(drippingHashPayload?.summary?.currentAmount);
     const previousAmount = Number(drippingHashPayload?.summary?.previousAmount);
     const cycleDuration = 604800;
-    const lastCycleStart = (0, import_utils10.convertChainCycleToUnix)(Number(currentCycleIndex));
+    const lastCycleStart = (0, import_utils11.convertChainCycleToUnix)(Number(currentCycleIndex));
     const timeSinceCycleStart = Date.now() / 1e3 - lastCycleStart;
     const currentUserRewards = currentAmount * Math.min(timeSinceCycleStart, cycleDuration) / cycleDuration + previousAmount;
     const lastWeekRewards = Number(lastWeekHashPayload?.summary?.currentAmount);
@@ -4627,7 +4645,7 @@ var getUserAutoEthRewards = async (wagmiConfig, rewardsV1Url, rewardsHash, addre
     rewardsHash,
     chainId
   });
-  const currentUserRewardsUsd = (0, import_utils10.formatCurrency)(
+  const currentUserRewardsUsd = (0, import_utils11.formatCurrency)(
     ethPrice * (autoETHRewards?.currentUserRewards || 0)
   );
   return { ...autoETHRewards, currentUserRewardsUsd };
@@ -4793,17 +4811,17 @@ var getUserV1 = async (wagmiConfig, {
 
 // functions/getChainUserAutopoolsHistory.tsx
 var import_graph_cli6 = require("@tokemak/graph-cli");
+var import_constants7 = require("@tokemak/constants");
 var getChainUserAutopoolsHistory = async ({
   address,
   chainId = 1
 }) => {
   const { GetUserVaultsDayData } = (0, import_graph_cli6.getSdkByChainId)(chainId);
-  const oneYearAgoTimestamp = Math.floor(Date.now() / 1e3) - 365 * 24 * 60 * 60;
   try {
     if (address) {
       const { userVaultDayDatas } = await GetUserVaultsDayData({
         address,
-        timestamp: oneYearAgoTimestamp
+        timestamp: import_constants7.TOKEMAK_LAUNCH_TIMESTAMP
       });
       return userVaultDayDatas;
     }
@@ -4815,11 +4833,11 @@ var getChainUserAutopoolsHistory = async ({
 };
 
 // functions/getUserAutopoolsHistory.ts
-var import_utils14 = require("@tokemak/utils");
+var import_utils15 = require("@tokemak/utils");
 
 // functions/getTokenValueDayDatas.ts
 var import_chains5 = require("viem/chains");
-var import_utils11 = require("@tokemak/utils");
+var import_utils12 = require("@tokemak/utils");
 var import_viem6 = require("viem");
 var import_graph_cli7 = require("@tokemak/graph-cli");
 var getTokenValueDayDatas = async (tokenAddress, chainId = import_chains5.mainnet.id) => {
@@ -4829,7 +4847,7 @@ var getTokenValueDayDatas = async (tokenAddress, chainId = import_chains5.mainne
       tokenAddress: tokenAddress.toLowerCase()
     });
     const historicalPrice = tokenValueDayDatas.map((tokenValueDayData) => {
-      const date = (0, import_utils11.convertTimestampToDate)(
+      const date = (0, import_utils12.convertTimestampToDate)(
         tokenValueDayData.lastSnapshotTimestamp
       );
       const usdPrice = (0, import_viem6.formatUnits)(tokenValueDayData.priceInUsd, 8);
@@ -4847,7 +4865,7 @@ var getTokenValueDayDatas = async (tokenAddress, chainId = import_chains5.mainne
 
 // functions/getTokenPrices.ts
 var import_tokenlist4 = require("@tokemak/tokenlist");
-var import_constants6 = require("@tokemak/constants");
+var import_constants8 = require("@tokemak/constants");
 
 // functions/getBackupTokenPrices.ts
 var getBackupTokenPrices = async () => {
@@ -4899,7 +4917,7 @@ var getTokenPrices = async (isCronJob = false) => {
         timeoutMS: 5 * 1e3
       }))
     };
-    const response = await fetch(`${import_constants6.TOKEMAK_PRICES_STAGING_URL}`, {
+    const response = await fetch(`${import_constants8.TOKEMAK_PRICES_STAGING_URL}`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -5084,10 +5102,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);
@@ -5097,7 +5113,7 @@ var getUserAutopoolsHistory = async (address, autopoolsHistory, events, includeT
               Math.floor(sharesRatio * Number(SCALE))
             );
             const navBigInt = sharesRatioBigInt * BigInt(dayData.nav) / SCALE;
-            const navNum = (0, import_utils14.formatUnitsNum)(
+            const navNum = (0, import_utils15.formatUnitsNum)(
               navBigInt,
               dayData.baseAsset.decimals
             );
@@ -5168,7 +5184,7 @@ var getUserAutopoolsHistory = async (address, autopoolsHistory, events, includeT
   let finalAggregatedHistoryArray = Object.keys(aggregatedHistoryArray).map(
     (dateKey) => ({
       date: aggregatedHistoryArray[dateKey].date,
-      formattedDate: (0, import_utils14.formatDateToReadable)(aggregatedHistoryArray[dateKey].date),
+      formattedDate: (0, import_utils15.formatDateToReadable)(aggregatedHistoryArray[dateKey].date),
       nav: {
         ETH: aggregatedHistoryArray[dateKey].nav.ETH,
         USD: aggregatedHistoryArray[dateKey].nav.USD,
@@ -5200,12 +5216,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 + (0, import_utils14.formatEtherNum)(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 = (0, import_utils15.formatUnitsNum)(
+          BigInt(event.assetChange || 0n),
+          decimals
+        );
+        return sum + assetChangeNum;
+      }, 0);
       return {
         ...dayData,
         events: eventsForDay,
@@ -5383,10 +5415,10 @@ var getMutlipleAutopoolRebalances = async (ids, chainId = 1) => {
 
 // functions/getAutopoolDayData.ts
 var import_viem7 = require("viem");
-var import_utils16 = require("@tokemak/utils");
-var import_constants7 = require("@tokemak/constants");
+var import_utils17 = require("@tokemak/utils");
+var import_constants9 = require("@tokemak/constants");
 var import_graph_cli9 = require("@tokemak/graph-cli");
-var getAutopoolDayData = async (address, chainId = 1, startTimestamp = import_constants7.TOKEMAK_LAUNCH_TIMESTAMP) => {
+var getAutopoolDayData = async (address, chainId = 1, startTimestamp = import_constants9.TOKEMAK_LAUNCH_TIMESTAMP) => {
   try {
     const { GetAutopoolDayData } = (0, import_graph_cli9.getSdkByChainId)(chainId);
     const { autopoolDayDatas } = await GetAutopoolDayData({
@@ -5397,10 +5429,10 @@ var getAutopoolDayData = async (address, chainId = 1, startTimestamp = import_co
       const navPerShare = autoPoolDayData.nav / autoPoolDayData.totalSupply;
       let baseApy = autoPoolDayData.autopoolApy;
       let rewarderApy = 0;
-      const formattedRewarder7DayMAApy = (0, import_utils16.formatEtherNum)(
+      const formattedRewarder7DayMAApy = (0, import_utils17.formatEtherNum)(
         BigInt(Number(autoPoolDayData.rewarderDay7MAApy) || 0)
       );
-      const formattedRewarder30DayMAApy = (0, import_utils16.formatEtherNum)(
+      const formattedRewarder30DayMAApy = (0, import_utils17.formatEtherNum)(
         BigInt(Number(autoPoolDayData.rewarderDay30MAApy) || 0)
       );
       if (formattedRewarder7DayMAApy) {
@@ -5500,13 +5532,13 @@ var getChainUserAutopools = async ({
 };
 
 // functions/getUserAutopools.ts
-var import_utils18 = require("@tokemak/utils");
+var import_utils19 = require("@tokemak/utils");
 var import_tokenlist6 = require("@tokemak/tokenlist");
 
 // functions/getUserAutopool.tsx
 var import_viem8 = require("viem");
 var import_core9 = require("@wagmi/core");
-var import_utils17 = require("@tokemak/utils");
+var import_utils18 = require("@tokemak/utils");
 var import_abis9 = require("@tokemak/abis");
 var getUserAutopool = async (wagmiConfig, {
   address,
@@ -5555,10 +5587,10 @@ var getUserAutopool = async (wagmiConfig, {
         args: [address],
         chainId: autopool?.chain?.chainId
       });
-      const stakedShares = (0, import_utils17.formatEtherNum)(stakedPoolShares);
+      const stakedShares = (0, import_utils18.formatEtherNum)(stakedPoolShares);
       const stakedNav = stakedShares * (autopool?.navPerShare.baseAsset || 0);
       const stakedNavUsd = stakedShares * (autopool?.navPerShare.USD || 0);
-      const unstakedShares = (0, import_utils17.formatEtherNum)(unstakedPoolShares || 0n);
+      const unstakedShares = (0, import_utils18.formatEtherNum)(unstakedPoolShares || 0n);
       const unstakedNav = unstakedShares * (autopool?.navPerShare.USD || 0);
       const unstakedNavUsd = unstakedShares * (autopool?.navPerShare.USD || 0);
       const totalShares = unstakedShares + stakedShares;
@@ -5579,7 +5611,7 @@ var getUserAutopool = async (wagmiConfig, {
         });
         pastRewarderBalances = pastRewards.map(({ result }, index) => {
           const balance = result;
-          const shares = (0, import_utils17.formatEtherNum)(result);
+          const shares = (0, import_utils18.formatEtherNum)(result);
           const nav = shares * (autopool?.navPerShare.baseAsset || 0);
           const navUsd = shares * (autopool?.navPerShare.USD || 0);
           return {
@@ -5697,14 +5729,14 @@ var getUserAutopools = async ({
         );
         if (autopoolData) {
           const isDOLA = autopoolData.symbol === "autoDOLA" && userAutoDOLA;
-          const userShares = isDOLA ? userAutoDOLA?.totalShares : (0, import_utils18.formatEtherNum)(userAutopool?.totalShares);
-          const totalVaultShares = (0, import_utils18.formatEtherNum)(autopoolData?.totalSupply);
+          const userShares = isDOLA ? userAutoDOLA?.totalShares : (0, import_utils19.formatEtherNum)(userAutopool?.totalShares);
+          const totalVaultShares = (0, import_utils19.formatEtherNum)(autopoolData?.totalSupply);
           const userShareOfVault = userShares / totalVaultShares;
-          const totalDeposits = (0, import_utils18.formatUnitsNum)(
+          const totalDeposits = (0, import_utils19.formatUnitsNum)(
             userActivity?.totals[userAutopool.vaultAddress]?.totalDeposits || 0n,
             autopoolData?.baseAsset.decimals
           );
-          const totalWithdrawals = (0, import_utils18.formatUnitsNum)(
+          const totalWithdrawals = (0, import_utils19.formatUnitsNum)(
             userActivity?.totals[userAutopool.vaultAddress]?.totalWithdrawals || 0n,
             autopoolData?.baseAsset.decimals
           );
@@ -5713,7 +5745,7 @@ var getUserAutopools = async ({
           );
           let lastDeposit;
           if (poolEvents && poolEvents?.length > 0) {
-            lastDeposit = (0, import_utils18.convertTimestampToDate)(
+            lastDeposit = (0, import_utils19.convertTimestampToDate)(
               poolEvents[poolEvents.length - 1].timestamp
             ).toLocaleDateString("en-US", {
               day: "2-digit",
@@ -5813,7 +5845,7 @@ var getUserAutopools = async ({
             totalWithdrawals: prev.totalWithdrawals + totalWithdrawals
           };
           const stakedBalance = isDOLA ? userAutoDOLA?.staked.balance : BigInt(userAutopool?.stakedShares);
-          const stakedShares = isDOLA ? userAutoDOLA?.staked.shares : (0, import_utils18.formatEtherNum)(stakedBalance);
+          const stakedShares = isDOLA ? userAutoDOLA?.staked.shares : (0, import_utils19.formatEtherNum)(stakedBalance);
           const stakedNav = stakedShares * (autopoolData?.navPerShare.baseAsset || 0);
           const staked = convertBaseAssetToTokenPrices(
             stakedNav,
@@ -5821,7 +5853,7 @@ var getUserAutopools = async ({
             prices
           );
           const unstakedBalance = isDOLA ? userAutoDOLA?.unstaked.balance : BigInt(userAutopool?.walletShares);
-          const unstakedShares = isDOLA ? userAutoDOLA?.unstaked.shares : (0, import_utils18.formatEtherNum)(unstakedBalance);
+          const unstakedShares = isDOLA ? userAutoDOLA?.unstaked.shares : (0, import_utils19.formatEtherNum)(unstakedBalance);
           const unstakedNav = unstakedShares * (autopoolData?.navPerShare.baseAsset || 0);
           const unstaked = convertBaseAssetToTokenPrices(
             unstakedNav,
@@ -5830,10 +5862,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,
@@ -5856,7 +5885,6 @@ var getUserAutopools = async ({
               nav: unstaked
             },
             useDenomination: autopoolData?.useDenomination,
-            baseApr,
             blendedApr,
             rewardsClaimed: userAutopool?.rewardsClaimed,
             lastDeposit,
@@ -6200,7 +6228,7 @@ var getChainUserAutopoolsRewards = async (wagmiConfig, {
 };
 
 // functions/getUserAutopoolsRewards.ts
-var import_utils22 = require("@tokemak/utils");
+var import_utils23 = require("@tokemak/utils");
 var import_tokenlist8 = require("@tokemak/tokenlist");
 var import_chains7 = require("viem/chains");
 var getUserAutopoolsRewards = async (wagmiConfig, {
@@ -6232,7 +6260,7 @@ var getUserAutopoolsRewards = async (wagmiConfig, {
             return [];
           }
           return autopool.extraRewarders.map((extraRewards2) => {
-            const rewarderToken = (0, import_utils22.getToken)(
+            const rewarderToken = (0, import_utils23.getToken)(
               extraRewards2.rewardToken?.id,
               autopool.chain?.chainId
             );
@@ -6241,7 +6269,7 @@ var getUserAutopoolsRewards = async (wagmiConfig, {
             if (rewarderToken.symbol === "XSILO") {
               price = tokenPrices[import_tokenlist8.SILO_TOKEN.symbol] || 0;
             }
-            const formattedAmount = (0, import_utils22.formatUnitsNum)(
+            const formattedAmount = (0, import_utils23.formatUnitsNum)(
               claimableAmount,
               rewarderToken.decimals || 18
             );
@@ -6259,7 +6287,7 @@ var getUserAutopoolsRewards = async (wagmiConfig, {
       const tokenRewards = {};
       Object.values(chainUserRewards).forEach((autopoolRewards) => {
         Object.entries(autopoolRewards).forEach(([tokenAddress, amount]) => {
-          const token = (0, import_utils22.getToken)(tokenAddress, chainId);
+          const token = (0, import_utils23.getToken)(tokenAddress, chainId);
           const tokenSymbol = token.symbol;
           if (!tokenRewards[tokenSymbol]) {
             tokenRewards[tokenSymbol] = {
@@ -6279,7 +6307,7 @@ var getUserAutopoolsRewards = async (wagmiConfig, {
           if (tokenSymbol === "XSILO") {
             price = tokenPrices[import_tokenlist8.SILO_TOKEN.symbol] || 0;
           }
-          const formattedAmount = (0, import_utils22.formatUnitsNum)(amount, decimals || 18);
+          const formattedAmount = (0, import_utils23.formatUnitsNum)(amount, decimals || 18);
           tokenRewards[tokenSymbol] = {
             amount,
             formattedAmount,
@@ -6350,10 +6378,10 @@ var getUserAutopoolsRewards = async (wagmiConfig, {
 
 // functions/getAmountWithdrawn.ts
 var import_viem13 = require("viem");
-var import_utils24 = require("@tokemak/utils");
+var import_utils25 = require("@tokemak/utils");
 
 // functions/getSwapQuote.ts
-var import_constants8 = require("@tokemak/constants");
+var import_constants10 = require("@tokemak/constants");
 
 // functions/getAddressFromSystemRegistry.ts
 var import_core12 = require("@wagmi/core");
@@ -6398,7 +6426,7 @@ var getSwapQuote = async (config, { chainId, ...params }) => {
     }
     const sellAmount = params.sellAmount.toString();
     const taker = await getAutopilotRouter(config, { chainId });
-    const response = await fetch(import_constants8.TOKEMAK_SWAP_QUOTE_URL, {
+    const response = await fetch(import_constants10.TOKEMAK_SWAP_QUOTE_URL, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -6429,7 +6457,7 @@ var import_abis12 = require("@tokemak/abis");
 var import_config11 = require("@tokemak/config");
 var import_autopilot_swap_route_calc = require("@tokemak/autopilot-swap-route-calc");
 var import_viem12 = require("viem");
-var import_constants9 = require("@tokemak/constants");
+var import_constants11 = require("@tokemak/constants");
 var placeholderAddress = "0x8b4334d4812c530574bd4f2763fcd22de94a969b";
 var getDynamicSwap = async ({
   address,
@@ -6474,12 +6502,13 @@ var getDynamicSwap = async ({
         body: JSON.stringify({
           chainId,
           systemName: "gen3",
-          slippageBps: Math.floor(slippage * 1e4),
+          // slippageBps: Math.floor(slippage * 10000),
+          slippageBps: 2e3,
           tokensToLiquidate,
           sellAllOnlyCompatible: true
         })
       };
-      dynamicSwaps = await (await fetch(import_constants9.TOKEMAK_DYNAMIC_SWAP_ROUTES_URL, requestInit)).json();
+      dynamicSwaps = await (await fetch(import_constants11.TOKEMAK_DYNAMIC_SWAP_ROUTES_URL, requestInit)).json();
       if (dynamicSwaps?.success) {
         const autopoolRouter = await getAutopilotRouter(config, { chainId });
         if (!autopoolRouter) {
@@ -6564,7 +6593,7 @@ var getAmountWithdrawn = async ({
     let quote;
     let convertedAssets;
     if (!!dynamicSwap?.previewRedeem) {
-      const minAmountWithSlippage = (0, import_utils24.calculateMinAmountWithSlippage)(
+      const minAmountWithSlippage = (0, import_utils25.calculateMinAmountWithSlippage)(
         dynamicSwap?.previewRedeem,
         slippage
       );
@@ -6588,7 +6617,7 @@ var getAmountWithdrawn = async ({
           buyToken,
           sellToken,
           sellAmount: dynamicSwap?.previewRedeem,
-          slippageBps: (0, import_utils24.convertNumToBps)(slippage),
+          slippageBps: (0, import_utils25.convertNumToBps)(slippage),
           chainId,
           includeSources: "0xV2",
           sellAll: true
@@ -6616,7 +6645,7 @@ var getAmountWithdrawn = async ({
 // functions/getAmountDeposited.ts
 var import_core15 = require("@wagmi/core");
 var import_abis14 = require("@tokemak/abis");
-var import_utils25 = require("@tokemak/utils");
+var import_utils26 = require("@tokemak/utils");
 var getAmountDeposited = async ({
   address,
   chainId,
@@ -6637,13 +6666,13 @@ var getAmountDeposited = async ({
       chainId
     });
     if (!isSwap) {
-      let minAmountWithSlippage = (0, import_utils25.calculateMinAmountWithSlippage)(
+      let minAmountWithSlippage = (0, import_utils26.calculateMinAmountWithSlippage)(
         previewDeposit,
         slippage
       );
-      return (0, import_utils25.formatEtherNum)(minAmountWithSlippage);
+      return (0, import_utils26.formatEtherNum)(minAmountWithSlippage);
     } else {
-      return (0, import_utils25.formatEtherNum)(previewDeposit);
+      return (0, import_utils26.formatEtherNum)(previewDeposit);
     }
   } catch (e) {
     console.error(e);
@@ -7505,7 +7534,7 @@ var waitForMessageReceived = async ({
 // functions/getChainUserSToke.ts
 var import_abis17 = require("@tokemak/abis");
 var import_config13 = require("@tokemak/config");
-var import_utils26 = require("@tokemak/utils");
+var import_utils27 = require("@tokemak/utils");
 var import_core18 = require("@wagmi/core");
 var import_viem15 = require("viem");
 var import_chains9 = require("viem/chains");
@@ -7581,8 +7610,8 @@ var getChainUserSToke = async (wagmiConfig, {
         if (withdrawalAmount > 0n && cycleIndex >= withdrawalMinCycle) {
           balanceExcludingWithdrawal = balanceExcludingWithdrawal - withdrawalAmount;
         }
-        const withdrawalAmountUsd = (0, import_utils26.formatCurrency)(
-          (0, import_utils26.formatEtherNum)(withdrawalAmount) * tokePrice
+        const withdrawalAmountUsd = (0, import_utils27.formatCurrency)(
+          (0, import_utils27.formatEtherNum)(withdrawalAmount) * tokePrice
         );
         const lockDuration = Number(depositLockDuration);
         const lockCycle = Number(depositLockCycle);
@@ -7603,16 +7632,16 @@ var getChainUserSToke = async (wagmiConfig, {
         const withdrawAvailable = lockRenew - 1;
         const hasAddedLockedToke = depositAmount > 0n && depositAmount > rolloverDepositAmount;
         const addedLockedToke = depositAmount - rolloverDepositAmount;
-        const balanceUSD = (0, import_utils26.formatCurrency)(
+        const balanceUSD = (0, import_utils27.formatCurrency)(
           Number((0, import_viem15.formatEther)(balanceExcludingWithdrawal)) * tokePrice
         );
-        const balanceExcludingWithdrawalUsd = (0, import_utils26.formatCurrency)(
-          (0, import_utils26.formatEtherNum)(balanceExcludingWithdrawal) * tokePrice
+        const balanceExcludingWithdrawalUsd = (0, import_utils27.formatCurrency)(
+          (0, import_utils27.formatEtherNum)(balanceExcludingWithdrawal) * tokePrice
         );
         const isUnlockRequestAvailable = currentCycle === withdrawAvailable;
         const hasRequestedUnlock = withdrawalAmount > 0n;
-        const unlockRequestPeriodStartUnix = (0, import_utils26.convertChainCycleToUnix)(withdrawAvailable, chainId) - Date.now() / 1e3;
-        const unlockRequestPeriodEndUnix = (0, import_utils26.convertChainCycleToUnix)(lockRenew, chainId) - Date.now() / 1e3;
+        const unlockRequestPeriodStartUnix = (0, import_utils27.convertChainCycleToUnix)(withdrawAvailable, chainId) - Date.now() / 1e3;
+        const unlockRequestPeriodEndUnix = (0, import_utils27.convertChainCycleToUnix)(lockRenew, chainId) - Date.now() / 1e3;
         const hasBalance = balance > 0n;
         const hasBalanceExcludingWithdrawal = balanceExcludingWithdrawal > 0n;
         const hasUnlockableBalance = withdrawalMinCycle <= currentCycle && withdrawalAmount > 0n;
@@ -7622,8 +7651,8 @@ var getChainUserSToke = async (wagmiConfig, {
           lockDurationInMonths = lockDuration - 1;
         }
         const unlockPeriodDateRangeArray = [
-          new Date((0, import_utils26.convertChainCycleToUnix)(withdrawAvailable, chainId) * 1e3),
-          new Date((0, import_utils26.convertChainCycleToUnix)(lockRenew, chainId) * 1e3)
+          new Date((0, import_utils27.convertChainCycleToUnix)(withdrawAvailable, chainId) * 1e3),
+          new Date((0, import_utils27.convertChainCycleToUnix)(lockRenew, chainId) * 1e3)
         ];
         const {
           unlockPeriodDateRange,
@@ -7635,18 +7664,18 @@ var getChainUserSToke = async (wagmiConfig, {
           unlockPeriodDateRangeArray,
           chainId === import_chains9.sepolia.id ? "time" : "date"
         );
-        const totalActiveUserCredits = (0, import_utils26.formatEtherNum)(balanceExcludingWithdrawal) * lockDurationInMonths;
-        const totalUserCredits = (0, import_utils26.formatEtherNum)(balance) * lockDurationInMonths;
+        const totalActiveUserCredits = (0, import_utils27.formatEtherNum)(balanceExcludingWithdrawal) * lockDurationInMonths;
+        const totalUserCredits = (0, import_utils27.formatEtherNum)(balance) * lockDurationInMonths;
         return {
           balance,
           balanceUSD,
           balanceExcludingWithdrawal: hasBalance ? (0, import_viem15.formatEther)(balanceExcludingWithdrawal) : "0.00",
           balanceExcludingWithdrawalUsd,
           hasBalanceExcludingWithdrawal,
-          timeLeftBeforeUnlockRequestAvailable: (0, import_utils26.convertSecondsToRemainingTime)(
+          timeLeftBeforeUnlockRequestAvailable: (0, import_utils27.convertSecondsToRemainingTime)(
             unlockRequestPeriodStartUnix
           ),
-          timeLeftBeforeUnlockRequestUnavailable: (0, import_utils26.convertSecondsToRemainingTime)(
+          timeLeftBeforeUnlockRequestUnavailable: (0, import_utils27.convertSecondsToRemainingTime)(
             unlockRequestPeriodEndUnix
           ),
           withdrawalAmount,
@@ -7663,7 +7692,7 @@ var getChainUserSToke = async (wagmiConfig, {
           unlockRenewalDate,
           lockDurationInMonths,
           boost: lockDuration,
-          points: (0, import_utils26.formatEtherNum)(balanceExcludingWithdrawal) * lockDuration,
+          points: (0, import_utils27.formatEtherNum)(balanceExcludingWithdrawal) * lockDuration,
           totalActiveCredits: totalActiveUserCredits,
           totalCredits: totalUserCredits
         };
@@ -7675,7 +7704,7 @@ var getChainUserSToke = async (wagmiConfig, {
 };
 
 // functions/getUserSToke.ts
-var import_utils28 = require("@tokemak/utils");
+var import_utils29 = require("@tokemak/utils");
 var getUserSToke = async (wagmiConfig, {
   address,
   tokePrice,
@@ -7702,8 +7731,8 @@ var getUserSToke = async (wagmiConfig, {
       }
       return acc;
     }, 0n);
-    const totalBalance = (0, import_utils28.formatEtherNum)(totalBalanceRaw || 0n);
-    const totalBalanceUsd = (0, import_utils28.formatCurrency)(totalBalance * tokePrice);
+    const totalBalance = (0, import_utils29.formatEtherNum)(totalBalanceRaw || 0n);
+    const totalBalanceUsd = (0, import_utils29.formatCurrency)(totalBalance * tokePrice);
     const hasBalance = totalBalance > 0;
     return {
       chains: { ...userSToke },
@@ -7720,9 +7749,9 @@ var getUserSToke = async (wagmiConfig, {
 var import_viem16 = require("viem");
 var import_core19 = require("@wagmi/core");
 var import_abis18 = require("@tokemak/abis");
-var import_utils30 = require("@tokemak/utils");
-var import_config14 = require("@tokemak/config");
 var import_utils31 = require("@tokemak/utils");
+var import_config14 = require("@tokemak/config");
+var import_utils32 = require("@tokemak/utils");
 var getChainSToke = async (wagmiConfig, {
   tokePrice,
   chainId
@@ -7748,15 +7777,15 @@ var getChainSToke = async (wagmiConfig, {
         ]
       });
       const tvl = Number((0, import_viem16.formatEther)(totalSupply || 0n)) * tokePrice;
-      const secondsLeftBeforeNextCycle = (0, import_utils30.convertChainCycleToUnix)(Number(currentCycle) + 1, chainId) - Date.now() / 1e3;
+      const secondsLeftBeforeNextCycle = (0, import_utils31.convertChainCycleToUnix)(Number(currentCycle) + 1, chainId) - Date.now() / 1e3;
       return {
         rawTotalSupply: totalSupply,
-        totalSupply: (0, import_utils30.formatLargeNumber)((0, import_viem16.formatEther)(totalSupply || 0n)),
-        tvl: (0, import_utils30.formatTVL)(tvl),
+        totalSupply: (0, import_utils31.formatLargeNumber)((0, import_viem16.formatEther)(totalSupply || 0n)),
+        tvl: (0, import_utils31.formatTVL)(tvl),
         rawTVL: tvl,
         currentCycle,
-        chain: (0, import_utils31.getNetwork)(chainId),
-        timeBeforeNextCycle: (0, import_utils30.convertSecondsToRemainingTime)(
+        chain: (0, import_utils32.getNetwork)(chainId),
+        timeBeforeNextCycle: (0, import_utils31.convertSecondsToRemainingTime)(
           secondsLeftBeforeNextCycle
         )
       };
@@ -7767,7 +7796,7 @@ var getChainSToke = async (wagmiConfig, {
 };
 
 // functions/getSToke.ts
-var import_utils32 = require("@tokemak/utils");
+var import_utils33 = require("@tokemak/utils");
 var import_viem17 = require("viem");
 var getSToke = async (wagmiConfig, {
   tokePrice,
@@ -7787,14 +7816,14 @@ var getSToke = async (wagmiConfig, {
       }
       return acc;
     }, 0n);
-    const totalSupply = (0, import_utils32.formatLargeNumber)((0, import_viem17.formatEther)(totalSupplyBigInt || 0n));
+    const totalSupply = (0, import_utils33.formatLargeNumber)((0, import_viem17.formatEther)(totalSupplyBigInt || 0n));
     let tvlNum = Object.values(sToke).reduce((acc, item) => {
       if (item && item.rawTVL) {
         return acc + item.rawTVL;
       }
       return acc;
     }, 0);
-    const tvl = (0, import_utils32.formatTVL)(tvlNum);
+    const tvl = (0, import_utils33.formatTVL)(tvlNum);
     return { totalSupply, tvl, rawTVL: tvlNum, chains: { ...sToke } };
   } catch (e) {
     console.error(e);
@@ -7846,7 +7875,7 @@ var getChainCycleRolloverBlockNumber = async (wagmiConfig, {
 };
 
 // functions/getChainUserSTokeVotes.ts
-var import_utils35 = require("@tokemak/utils");
+var import_utils36 = require("@tokemak/utils");
 var import_graph_cli13 = require("@tokemak/graph-cli");
 var getChainUserSTokeVotes = async ({
   address,
@@ -7869,10 +7898,10 @@ var getChainUserSTokeVotes = async ({
         subgraphUserVotesData?.pools || [],
         subgraphUserVotesData?.weights || []
       );
-      const stakedToke = (0, import_utils35.formatEtherNum)(
+      const stakedToke = (0, import_utils36.formatEtherNum)(
         BigInt(subgraphAccountVotesBalance?.amount || 0n)
       );
-      const totalUserVotes = (0, import_utils35.formatEtherNum)(
+      const totalUserVotes = (0, import_utils36.formatEtherNum)(
         BigInt(subgraphAccountVotesBalance?.points || 0n)
       );
       const autopools = {};
@@ -7960,7 +7989,7 @@ var getUserSTokeVotes = async ({
 
 // functions/getChainSTokeVotes.ts
 var import_config15 = require("@tokemak/config");
-var import_utils38 = require("@tokemak/utils");
+var import_utils39 = require("@tokemak/utils");
 var import_viem18 = require("viem");
 var import_graph_cli14 = require("@tokemak/graph-cli");
 var getChainSTokeVotes = async ({
@@ -7991,13 +8020,13 @@ var getChainSTokeVotes = async ({
     updatedPoints
   );
   const globalSystemVotes = globalVoted + globalNotVoted;
-  const totalSystemVotesNum = (0, import_utils38.formatEtherNum)(globalSystemVotes);
+  const totalSystemVotesNum = (0, import_utils39.formatEtherNum)(globalSystemVotes);
   const formattedAutopoolVotes = Object.fromEntries(
     Object.entries(autopoolVotes).filter(
       ([poolAddress]) => includeTestnet ? true : whitelistedPools.includes(poolAddress)
     ).map(([poolAddress, rawVote]) => {
-      const formattedVote = (0, import_utils38.formatLargeNumber)(
-        (0, import_utils38.formatEtherNum)(BigInt(rawVote))
+      const formattedVote = (0, import_utils39.formatLargeNumber)(
+        (0, import_utils39.formatEtherNum)(BigInt(rawVote))
       );
       return [
         poolAddress,
@@ -8012,7 +8041,7 @@ var getChainSTokeVotes = async ({
       globalSystemVotes
     },
     totalSystemVotesNum,
-    totalSystemVotes: (0, import_utils38.formatLargeNumber)(totalSystemVotesNum),
+    totalSystemVotes: (0, import_utils39.formatLargeNumber)(totalSystemVotesNum),
     autopoolVotes: formattedAutopoolVotes
   };
 };
@@ -8038,7 +8067,7 @@ var getSTokeVotes = async ({
 // functions/getChainSTokeRewards.ts
 var import_config16 = require("@tokemak/config");
 var import_viem19 = require("viem");
-var import_utils40 = require("@tokemak/utils");
+var import_utils41 = require("@tokemak/utils");
 var import_graph_cli15 = require("@tokemak/graph-cli");
 var getChainSTokeRewards = async ({
   chainId
@@ -8062,9 +8091,9 @@ var getChainSTokeRewards = async ({
       if (!whitelistedPools.includes(pool.id.toLowerCase())) {
         continue;
       }
-      const convertedBalance = (0, import_utils40.formatEtherNum)(pool.balance);
+      const convertedBalance = (0, import_utils41.formatEtherNum)(pool.balance);
       const convertedBalanceUSD = Number((0, import_viem19.formatUnits)(pool.balanceUSD, 8));
-      const convertedApr = (0, import_utils40.formatEtherNum)(pool.currentAprPerCredit);
+      const convertedApr = (0, import_utils41.formatEtherNum)(pool.currentAprPerCredit);
       if (minApr === null || convertedApr < minApr) {
         minApr = convertedApr;
       }
@@ -8137,7 +8166,7 @@ var getSTokeRewards = async ({
 
 // functions/getChainUserSTokeRewards.ts
 var import_config17 = require("@tokemak/config");
-var import_utils43 = require("@tokemak/utils");
+var import_utils44 = require("@tokemak/utils");
 var getChainUserSTokeRewards = async (wagmiConfig, {
   address,
   chainId,
@@ -8188,14 +8217,14 @@ var getChainUserSTokeRewards = async (wagmiConfig, {
       throw fallbackError;
     }
   }
-  const claimableNum = (0, import_utils43.formatEtherNum)(tokeRewards?.claimable || 0n);
+  const claimableNum = (0, import_utils44.formatEtherNum)(tokeRewards?.claimable || 0n);
   const claimableUsd = tokePrice * claimableNum;
   const hasClaimable = claimableNum > 0n;
-  const pendingRewards = (0, import_utils43.formatEtherNum)(
+  const pendingRewards = (0, import_utils44.formatEtherNum)(
     tokeRewards?.rewardsPayload.breakdown?.totalRewardAmount || 0n
   );
   const pendingRewardsUsd = tokePrice * pendingRewards;
-  const totalRewardsReceived = (0, import_utils43.formatEtherNum)(
+  const totalRewardsReceived = (0, import_utils44.formatEtherNum)(
     tokeRewards.rewardsPayload.payload.amount || 0n
   );
   const totalRewardsReceivedUsd = tokePrice * totalRewardsReceived;
@@ -8271,7 +8300,7 @@ var getSubgraphStatus = async (includeTestnet = false) => {
 var import_core21 = require("@wagmi/core");
 var import_abis20 = require("@tokemak/abis");
 var import_viem20 = require("viem");
-var import_utils45 = require("@tokemak/utils");
+var import_utils46 = require("@tokemak/utils");
 var import_config18 = require("@tokemak/config");
 var import_chains10 = require("viem/chains");
 var publicClient = (0, import_viem20.createPublicClient)({
@@ -8305,11 +8334,11 @@ var getCycleV1 = async (wagmiConfig, {
       });
       const rolloverEvents = await publicClient.getFilterLogs({ filter });
       const cycleRolloverBlockNumber = chainId === 1 ? rolloverEvents[rolloverEvents.length - 1]?.blockNumber : rolloverEvents[rolloverEvents.length - 1]?.blockNumber || currentBlockNumber;
-      const secondsLeftBeforeNextCycle = (0, import_utils45.convertChainCycleToUnix)(Number(currentCycleIndex) + 1) - Date.now() / 1e3;
+      const secondsLeftBeforeNextCycle = (0, import_utils46.convertChainCycleToUnix)(Number(currentCycleIndex) + 1) - Date.now() / 1e3;
       return {
         currentCycleIndex,
         cycleRolloverBlockNumber,
-        timeBeforeNextCycle: (0, import_utils45.convertSecondsToRemainingTime)(
+        timeBeforeNextCycle: (0, import_utils46.convertSecondsToRemainingTime)(
           secondsLeftBeforeNextCycle
         )
       };
@@ -8320,7 +8349,7 @@ var getCycleV1 = async (wagmiConfig, {
 };
 
 // functions/getProtocolStats.ts
-var import_utils46 = require("@tokemak/utils");
+var import_utils47 = require("@tokemak/utils");
 var getProtocolStats = async (autopools, stoke, sushiLP) => {
   try {
     if (!autopools || !stoke || !sushiLP) {
@@ -8350,12 +8379,12 @@ var getProtocolStats = async (autopools, stoke, sushiLP) => {
       Object.entries(categories).map(([key, value]) => [
         key,
         {
-          tvl: (0, import_utils46.formatTVL)(value.tvl),
-          supply: (0, import_utils46.formatLargeNumber)(value.supply || 0)
+          tvl: (0, import_utils47.formatTVL)(value.tvl),
+          supply: (0, import_utils47.formatLargeNumber)(value.supply || 0)
         }
       ])
     );
-    const tvl = (0, import_utils46.formatTVL)(autopoolTVL + stoke.rawTVL + (sushiLP?.tvl || 0));
+    const tvl = (0, import_utils47.formatTVL)(autopoolTVL + stoke.rawTVL + (sushiLP?.tvl || 0));
     const vaultAddresses = autopools?.flatMap(
       (pool) => pool.destinations.map((destination) => destination.vaultAddress)
     );
@@ -8363,16 +8392,16 @@ var getProtocolStats = async (autopools, stoke, sushiLP) => {
     const totalDestinations = uniqueVaultAddresses.length;
     return {
       autopools: {
-        tvl: (0, import_utils46.formatTVL)(autopoolTVL),
+        tvl: (0, import_utils47.formatTVL)(autopoolTVL),
         tvlNum: autopoolTVL,
         categories: formattedCategories
       },
       stoke: {
-        tvl: (0, import_utils46.formatTVL)(stoke.rawTVL),
+        tvl: (0, import_utils47.formatTVL)(stoke.rawTVL),
         totalSupply: `${stoke.totalSupply} TOKE`
       },
       sushiLP: {
-        tvl: (0, import_utils46.formatTVL)(sushiLP?.tvl || 0),
+        tvl: (0, import_utils47.formatTVL)(sushiLP?.tvl || 0),
         totalSupply: sushiLP?.totalSupply || 0
       },
       tvl,
@@ -8409,7 +8438,7 @@ var getEthPriceAtBlock = async (wagmiConfig, blockNumber, chainId) => {
 };
 
 // functions/getRebalanceStats.ts
-var import_utils48 = require("@tokemak/utils");
+var import_utils49 = require("@tokemak/utils");
 var import_tokenlist12 = require("@tokemak/tokenlist");
 var import_chains11 = require("viem/chains");
 var BATCH_SIZE = 500;
@@ -8443,8 +8472,8 @@ var getRebalanceValueUsd = async (rebalance, chainId, wagmiConfig) => {
       BigInt(rebalance.blockNumber),
       chainId
     );
-    const ethUsd = Number((0, import_utils48.formatUnitsNum)(price, import_tokenlist12.USDC_TOKEN.decimals));
-    const ethAmt = Number((0, import_utils48.formatEtherNum)(ethWei));
+    const ethUsd = Number((0, import_utils49.formatUnitsNum)(price, import_tokenlist12.USDC_TOKEN.decimals));
+    const ethAmt = Number((0, import_utils49.formatEtherNum)(ethWei));
     const usd = ethAmt * ethUsd;
     return usd;
   } catch (e) {
@@ -8453,6 +8482,13 @@ var getRebalanceValueUsd = async (rebalance, chainId, wagmiConfig) => {
   }
 };
 var processRebalance = async (rebalance, chainId, wagmiConfig) => {
+  const baseDecimals = inferBaseAssetDecimals(rebalance, chainId);
+  const baseAssetAmount = Number(
+    (0, import_utils49.formatUnitsNum)(
+      BigInt(rebalance.tokenOutValueBaseAsset || "0"),
+      baseDecimals
+    )
+  );
   const ethPathUsd = await getRebalanceValueUsd(
     rebalance,
     chainId,
@@ -8460,24 +8496,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(
-    (0, import_utils48.formatUnitsNum)(
-      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) => {
@@ -8590,8 +8623,11 @@ var updateRebalanceStats = async (wagmiConfig, {
   getAutopools,
   getAutopoolsHistory,
   getAutopoolsRebalances,
+  getBlobData,
+  getBlobHistoricalTokenPrices,
   getBridgeFee,
   getChainAutopools,
+  getChainAutopoolsApr,
   getChainCycleRolloverBlockNumber,
   getChainSToke,
   getChainSTokeRewards,
@@ -8611,6 +8647,7 @@ var updateRebalanceStats = async (wagmiConfig, {
   getEthPriceAtBlock,
   getExchangeNames,
   getGenStratAprs,
+  getHistoricalTokenPrices,
   getLayerzeroStatus,
   getMutlipleAutopoolRebalances,
   getPoolStats,