@strkfarm/sdk 1.1.21 → 1.1.23

package/dist/index.mjs

@@ -9690,15 +9690,15 @@ var VesuRebalance = class _VesuRebalance extends BaseStrategy {
   }
   async getPoolInfo(p, pools, vesuPositions, totalAssets, isErrorPositionsAPI, isErrorPoolsAPI) {
     const vesuPosition = vesuPositions.find(
-      (d) => d.pool.id.toString() === num4.getDecimalString(p.pool_id.address.toString())
+      (d) => ContractAddr.from(d.id).eq(p.pool_id)
     );
     const _pool = pools.find((d) => {
       logger.verbose(
-        `pool check: ${d.id == num4.getDecimalString(p.pool_id.address.toString())}, id: ${d.id}, pool_id: ${num4.getDecimalString(
+        `pool check: ${ContractAddr.from(d.id).eq(p.pool_id)}, id: ${d.id}, pool_id: ${num4.getDecimalString(
           p.pool_id.address.toString()
         )}`
       );
-      return d.id == num4.getDecimalString(p.pool_id.address.toString());
+      return ContractAddr.from(d.id).eq(p.pool_id);
     });
     logger.verbose(`pool: ${JSON.stringify(_pool)}`);
     logger.verbose(typeof _pool);
@@ -15288,6 +15288,17 @@ var erc4626_abi_default = [
   }
 ];
 
+// src/strategies/ekubo-cl-vault.tsx
+import { gql } from "@apollo/client";
+
+// src/modules/apollo-client.ts
+import { ApolloClient, InMemoryCache } from "@apollo/client";
+var apolloClient = new ApolloClient({
+  uri: "https://api.troves.fi/",
+  cache: new InMemoryCache()
+});
+var apollo_client_default = apolloClient;
+
 // src/strategies/ekubo-cl-vault.tsx
 import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
@@ -15445,11 +15456,75 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
   handleFeesCall() {
     return [this.contract.populate("handle_fees", [])];
   }
-  /**
-   * Calculates assets before and now in a given token of TVL per share to observe growth
-   * @returns {Promise<number>} The weighted average APY across all pools
-   */
-  async netAPY(blockIdentifier = "latest", sinceBlocks = 6e5) {
+  async getFeeHistory(timePeriod = "24h") {
+    const { data } = await apollo_client_default.query({
+      query: gql`
+        query ContractFeeEarnings(
+          $timeframe: String!
+          $contract: String!
+        ) {
+          contractFeeEarnings(timeframe: $timeframe, contract: $contract) {
+            contract
+            dailyEarnings {
+              date
+              tokenAddress
+              amount
+            }
+            totalCollections
+          }
+        }
+      `,
+      variables: {
+        timeframe: timePeriod,
+        contract: this.address.address
+      },
+      fetchPolicy: "no-cache"
+    });
+    const poolKey = await this.getPoolKey();
+    const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
+    const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
+    const price0 = await this.pricer.getPrice(token0Info.symbol);
+    const price1 = await this.pricer.getPrice(token1Info.symbol);
+    let totalToken0Amount = Web3Number.fromWei(0, token0Info.decimals);
+    let totalToken1Amount = Web3Number.fromWei(0, token1Info.decimals);
+    let totalToken0Usd = 0;
+    let totalToken1Usd = 0;
+    const parsedFeeInfo = [];
+    const feeInfo = data.contractFeeEarnings.dailyEarnings;
+    for (const d of feeInfo) {
+      const tokenInfo = await Global.getTokenInfoFromAddr(ContractAddr.from(d.tokenAddress));
+      const amount = Web3Number.fromWei(d.amount, tokenInfo.decimals);
+      if (tokenInfo.address.eq(poolKey.token0)) {
+        totalToken0Amount = totalToken0Amount.plus(amount);
+        totalToken0Usd = totalToken0Usd + amount.multipliedBy(price0.price).toNumber();
+      } else {
+        totalToken1Amount = totalToken1Amount.plus(amount);
+        totalToken1Usd = totalToken1Usd + amount.multipliedBy(price1.price).toNumber();
+      }
+      parsedFeeInfo.push({
+        date: d.date,
+        tokenInfo,
+        amount: Web3Number.fromWei(d.amount, tokenInfo.decimals)
+      });
+    }
+    return {
+      summary: {
+        usdValue: totalToken0Usd + totalToken1Usd,
+        token0: {
+          tokenInfo: token0Info,
+          amount: totalToken0Amount,
+          usdValue: totalToken0Usd
+        },
+        token1: {
+          tokenInfo: token1Info,
+          amount: totalToken1Amount,
+          usdValue: totalToken1Usd
+        }
+      },
+      history: parsedFeeInfo
+    };
+  }
+  async netSharesBasedTrueAPY(blockIdentifier = "latest", sinceBlocks = 6e5) {
     const tvlNow = await this._getTVL(blockIdentifier);
     const supplyNow = await this.totalSupply(blockIdentifier);
     const priceNow = await this.getCurrentPrice(blockIdentifier);
@@ -15487,6 +15562,23 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
     ) / 1e4;
     return apyForGivenBlocks * (365 * 24 * 3600) / timeDiffSeconds;
   }
+  async feeBasedAPY(blockIdentifier = "latest", sinceBlocks = 6e5) {
+    const feeInfo = await this.getFeeHistory("24h");
+    const tvlNow = await this.getTVL("latest");
+    return feeInfo.summary.usdValue * 365 / tvlNow.usdValue;
+  }
+  /**
+   * Calculates assets before and now in a given token of TVL per share to observe growth
+   * @returns {Promise<number>} The weighted average APY across all pools
+   */
+  async netAPY(blockIdentifier = "latest", sinceBlocks = 6e5) {
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
+    if (!isUSDCQouteToken) {
+      return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
+    } else {
+      return this.feeBasedAPY(blockIdentifier, sinceBlocks);
+    }
+  }
   async getHarvestRewardShares(fromBlock, toBlock) {
     const len = Number(await this.contract.call("get_total_rewards"));
     let shares = Web3Number.fromWei(0, 18);
@@ -16700,7 +16792,7 @@ var ETHUSDCRe7Strategy = {
     Global.getDefaultTokens().find((t) => t.symbol === "ETH"),
     Global.getDefaultTokens().find((t) => t.symbol === "USDC")
   ],
-  apyMethodology: "APY based on 7-day historical performance, including fees and rewards.",
+  apyMethodology: "Annualized fee APY, calculated as fees earned in the last 24h divided by TVL",
   additionalInfo: {
     newBounds: "Managed by Re7",
     truePrice: 1,
@@ -16721,6 +16813,10 @@ var ETHUSDCRe7Strategy = {
         /* @__PURE__ */ jsx3("a", { href: "https://www.re7labs.xyz", style: { textDecoration: "underline", marginLeft: "2px" }, target: "_blank", children: "here" }),
         "."
       ] })
+    },
+    {
+      question: "How is the APY calculated?",
+      answer: /* @__PURE__ */ jsx3("div", { children: "It's an annualized fee APY, calculated as fees earned in the last 24h divided by TVL. Factors like impermanent loss are not considered." })
     }
   ],
   risk: highRisk,
@@ -26689,7 +26785,7 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
     if (legAUM[0].token.address.eq(underlying.address)) {
       vesuAum = vesuAum.plus(legAUM[0].amount);
     } else {
-      vesuAum = vesuAum.plus(legAUM[1].usdValue / tokenUnderlyingPrice.price);
+      vesuAum = vesuAum.plus(legAUM[0].usdValue / tokenUnderlyingPrice.price);
     }
     if (legAUM[1].token.address.eq(underlying.address)) {
       vesuAum = vesuAum.minus(legAUM[1].amount);
@@ -26722,7 +26818,8 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
       amount: zeroAmt,
       usdValue: 0
     };
-    if (vesuAum.isZero()) {
+    const aumToken = vesuAum.plus(balance.amount);
+    if (aumToken.isZero()) {
       return { net, splits: [{
         aum: zeroAmt,
         id: "finalised" /* FINALISED */
@@ -26731,7 +26828,6 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
         id: "defispring" /* DEFISPRING */
       }], prevAum };
     }
-    const aumToken = vesuAum.plus(balance.amount);
     logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
     const rewardAssets = await this.getRewardsAUM(prevAum);
     const newAUM = aumToken.plus(rewardAssets);
@@ -27932,6 +28028,92 @@ var TelegramNotif = class {
   }
 };
 
+// src/notifs/telegram-group.ts
+import TelegramBot2 from "node-telegram-bot-api";
+var TelegramGroupNotif = class {
+  constructor(token, groupId, topicId) {
+    this.bot = new TelegramBot2(token, { polling: false });
+    this.groupId = groupId;
+    this.topicId = topicId;
+  }
+  // listen to start msgs, register chatId and send registered msg
+  activateChatBot() {
+    this.bot.on("message", (msg) => {
+      console.log(`Tg: Message received: `, msg);
+      const chatId = msg.chat.id;
+      let text = msg.text.toLowerCase().trim();
+      console.log(`Tg: IncomingMsg: ID: ${chatId}, msg: ${text}`, msg);
+      logger.verbose(`Tg: IncomingMsg: ID: ${chatId}, msg: ${text}`);
+    });
+  }
+  // send a message to the group
+  sendMessage(msg) {
+    logger.verbose(`Tg Group: Sending message to group ${this.groupId}: ${msg}`);
+    const messageOptions = {};
+    if (this.topicId !== void 0) {
+      messageOptions.message_thread_id = this.topicId;
+    }
+    this.bot.sendMessage(this.groupId, msg, messageOptions).catch((err) => {
+      logger.error(`Tg Group: Error sending message to group ${this.groupId}`);
+      logger.error(`Tg Group: Error details: ${err.message}`);
+    }).then(() => {
+      logger.verbose(`Tg Group: Message sent to group ${this.groupId}${this.topicId ? ` (topic: ${this.topicId})` : ""}`);
+    });
+  }
+  // send a message with specific formatting options
+  sendFormattedMessage(msg, parseMode) {
+    logger.verbose(`Tg Group: Sending formatted message to group ${this.groupId}: ${msg}`);
+    const messageOptions = {};
+    if (this.topicId !== void 0) {
+      messageOptions.message_thread_id = this.topicId;
+    }
+    if (parseMode) {
+      messageOptions.parse_mode = parseMode;
+    }
+    this.bot.sendMessage(this.groupId, msg, messageOptions).catch((err) => {
+      logger.error(`Tg Group: Error sending formatted message to group ${this.groupId}`);
+      logger.error(`Tg Group: Error details: ${err.message}`);
+    }).then(() => {
+      logger.verbose(`Tg Group: Formatted message sent to group ${this.groupId}${this.topicId ? ` (topic: ${this.topicId})` : ""}`);
+    });
+  }
+  // send a photo to the group
+  sendPhoto(photo, caption) {
+    logger.verbose(`Tg Group: Sending photo to group ${this.groupId}`);
+    const messageOptions = {};
+    if (this.topicId !== void 0) {
+      messageOptions.message_thread_id = this.topicId;
+    }
+    if (caption) {
+      messageOptions.caption = caption;
+    }
+    this.bot.sendPhoto(this.groupId, photo, messageOptions).catch((err) => {
+      logger.error(`Tg Group: Error sending photo to group ${this.groupId}`);
+      logger.error(`Tg Group: Error details: ${err.message}`);
+    }).then(() => {
+      logger.verbose(`Tg Group: Photo sent to group ${this.groupId}${this.topicId ? ` (topic: ${this.topicId})` : ""}`);
+    });
+  }
+  // get group information
+  getGroupInfo() {
+    return {
+      groupId: this.groupId,
+      topicId: this.topicId,
+      hasTopic: this.topicId !== void 0
+    };
+  }
+  // update group ID (useful if group ID changes)
+  updateGroupId(newGroupId) {
+    this.groupId = newGroupId;
+    logger.verbose(`Tg Group: Updated group ID to ${newGroupId}`);
+  }
+  // update topic ID (useful for switching topics)
+  updateTopicId(newTopicId) {
+    this.topicId = newTopicId;
+    logger.verbose(`Tg Group: Updated topic ID to ${newTopicId || "none"}`);
+  }
+};
+
 // src/node/pricer-redis.ts
 import { createClient } from "redis";
 var PricerRedis = class extends Pricer {
@@ -28349,6 +28531,7 @@ export {
   SenseiVault,
   StandardMerkleTree,
   Store,
+  TelegramGroupNotif,
   TelegramNotif,
   UNIVERSAL_ADAPTERS,
   UNIVERSAL_MANAGE_IDS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
   "typings": "dist/index.d.ts",
   "types": "dist/index.d.ts",
@@ -57,6 +57,7 @@
     "starknet": "8.5.2"
   },
   "dependencies": {
+    "@apollo/client": "3.11.8",
     "@avnu/avnu-sdk": "3.0.2",
     "@ericnordelo/strk-merkle-tree": "^1.0.0",
     "@noble/curves": "^1.0.0",
@@ -68,6 +69,7 @@
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
     "ethers": "^6.13.5",
+    "graphql": "16.9.0",
     "inquirer": "^10.1.2",
     "node-telegram-bot-api": "^0.66.0",
     "proxy-from-env": "^1.1.0",

package/src/modules/apollo-client.ts

@@ -0,0 +1,8 @@
+import { ApolloClient, InMemoryCache } from '@apollo/client';
+
+const apolloClient = new ApolloClient({
+  uri: 'https://api.troves.fi/',
+  cache: new InMemoryCache(),
+});
+
+export default apolloClient;

package/src/notifs/index.ts

@@ -1 +1,2 @@
-export * from './telegram';
+export * from './telegram';
+export * from './telegram-group';

package/src/notifs/telegram-group.ts

@@ -0,0 +1,115 @@
+import TelegramBot from "node-telegram-bot-api";
+import { logger } from "@/utils/logger";
+
+export class TelegramGroupNotif {
+    readonly bot: TelegramBot;
+    private groupId: string;
+    private topicId?: number;
+
+    constructor(token: string, groupId: string, topicId?: number) {
+        this.bot = new TelegramBot(token, { polling: false });
+        this.groupId = groupId;
+        this.topicId = topicId;
+    }
+
+    // listen to start msgs, register chatId and send registered msg
+    activateChatBot() {
+      this.bot.on('message', (msg: any) => {
+        console.log(`Tg: Message received: `, msg)
+        const chatId = msg.chat.id;
+        let text = msg.text.toLowerCase().trim()
+        console.log(`Tg: IncomingMsg: ID: ${chatId}, msg: ${text}`, msg)
+        logger.verbose(`Tg: IncomingMsg: ID: ${chatId}, msg: ${text}`)
+      });
+    }
+
+    // send a message to the group
+    sendMessage(msg: string) {
+        logger.verbose(`Tg Group: Sending message to group ${this.groupId}: ${msg}`);
+        
+        const messageOptions: any = {};
+        
+        // If topicId is provided, add it to the message options for supergroups with topics
+        if (this.topicId !== undefined) {
+            messageOptions.message_thread_id = this.topicId;
+        }
+
+        this.bot.sendMessage(this.groupId, msg, messageOptions)
+            .catch((err: any) => {
+                logger.error(`Tg Group: Error sending message to group ${this.groupId}`);
+                logger.error(`Tg Group: Error details: ${err.message}`);
+            })
+            .then(() => {
+                logger.verbose(`Tg Group: Message sent to group ${this.groupId}${this.topicId ? ` (topic: ${this.topicId})` : ''}`);
+            });
+    }
+
+    // send a message with specific formatting options
+    sendFormattedMessage(msg: string, parseMode?: 'HTML' | 'Markdown' | 'MarkdownV2') {
+        logger.verbose(`Tg Group: Sending formatted message to group ${this.groupId}: ${msg}`);
+        
+        const messageOptions: any = {};
+        
+        if (this.topicId !== undefined) {
+            messageOptions.message_thread_id = this.topicId;
+        }
+        
+        if (parseMode) {
+            messageOptions.parse_mode = parseMode;
+        }
+
+        this.bot.sendMessage(this.groupId, msg, messageOptions)
+            .catch((err: any) => {
+                logger.error(`Tg Group: Error sending formatted message to group ${this.groupId}`);
+                logger.error(`Tg Group: Error details: ${err.message}`);
+            })
+            .then(() => {
+                logger.verbose(`Tg Group: Formatted message sent to group ${this.groupId}${this.topicId ? ` (topic: ${this.topicId})` : ''}`);
+            });
+    }
+
+    // send a photo to the group
+    sendPhoto(photo: string | Buffer, caption?: string) {
+        logger.verbose(`Tg Group: Sending photo to group ${this.groupId}`);
+        
+        const messageOptions: any = {};
+        
+        if (this.topicId !== undefined) {
+            messageOptions.message_thread_id = this.topicId;
+        }
+        
+        if (caption) {
+            messageOptions.caption = caption;
+        }
+
+        this.bot.sendPhoto(this.groupId, photo, messageOptions)
+            .catch((err: any) => {
+                logger.error(`Tg Group: Error sending photo to group ${this.groupId}`);
+                logger.error(`Tg Group: Error details: ${err.message}`);
+            })
+            .then(() => {
+                logger.verbose(`Tg Group: Photo sent to group ${this.groupId}${this.topicId ? ` (topic: ${this.topicId})` : ''}`);
+            });
+    }
+
+    // get group information
+    getGroupInfo() {
+        return {
+            groupId: this.groupId,
+            topicId: this.topicId,
+            hasTopic: this.topicId !== undefined
+        };
+    }
+
+    // update group ID (useful if group ID changes)
+    updateGroupId(newGroupId: string) {
+        this.groupId = newGroupId;
+        logger.verbose(`Tg Group: Updated group ID to ${newGroupId}`);
+    }
+
+    // update topic ID (useful for switching topics)
+    updateTopicId(newTopicId?: number) {
+        this.topicId = newTopicId;
+        logger.verbose(`Tg Group: Updated topic ID to ${newTopicId || 'none'}`);
+    }
+}

package/src/strategies/ekubo-cl-vault.tsx

@@ -37,6 +37,8 @@ import { EkuboHarvests } from "@/modules/harvests";
 import { logger } from "@/utils/logger";
 import { COMMON_CONTRACTS } from "./constants";
 import { DepegRiskLevel, ImpermanentLossLevel, MarketRiskLevel, SmartContractRiskLevel } from "@/interfaces/risks";
+import { gql } from "@apollo/client";
+import apolloClient from "@/modules/apollo-client";
 
 export interface EkuboPoolKey {
   token0: ContractAddr;
@@ -51,6 +53,12 @@ export interface EkuboBounds {
   upperTick: bigint;
 }
 
+interface FeeHistory {
+  date: string;
+  tokenInfo: TokenInfo;
+  amount: Web3Number;
+}
+
 /**
  * Settings for the CLVaultStrategy
  *
@@ -285,11 +293,97 @@ export class EkuboCLVault extends BaseStrategy<
     return [this.contract.populate("handle_fees", [])];
   }
 
-  /**
-   * Calculates assets before and now in a given token of TVL per share to observe growth
-   * @returns {Promise<number>} The weighted average APY across all pools
-   */
-  async netAPY(
+  async getFeeHistory(timePeriod: '24h' | '30d' | '3m' = '24h'): Promise<{
+    summary: DualTokenInfo,
+    history: FeeHistory[]
+  }> {
+    const { data } = await apolloClient.query({
+      query: gql`
+        query ContractFeeEarnings(
+          $timeframe: String!
+          $contract: String!
+        ) {
+          contractFeeEarnings(timeframe: $timeframe, contract: $contract) {
+            contract
+            dailyEarnings {
+              date
+              tokenAddress
+              amount
+            }
+            totalCollections
+          }
+        }
+      `,
+      variables: {
+        timeframe: timePeriod,
+        contract: this.address.address
+      },
+      fetchPolicy: 'no-cache',
+    });
+
+    // Sample response type:
+    // {
+    //   contractFeeEarnings: {
+    //     contract: '0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1',
+    //     dailyEarnings: [ [Object], [Object], [Object], [Object] ],
+    //     totalCollections: 3,
+    //     __typename: 'FeeSummary'
+    //   }
+    // }
+    // dailyEarnings: {
+    //   date: '2025-09-27',
+    //   tokenAddress: '0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac',
+    //   amount: '15404',
+    //   __typename: 'DailyFeeEarnings'
+    // }[]
+
+    // get pool key and token info
+    const poolKey = await this.getPoolKey();
+    const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
+    const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
+    const price0 = await this.pricer.getPrice(token0Info.symbol);
+    const price1 = await this.pricer.getPrice(token1Info.symbol);
+    let totalToken0Amount = Web3Number.fromWei(0, token0Info.decimals);
+    let totalToken1Amount = Web3Number.fromWei(0, token1Info.decimals);
+    let totalToken0Usd = 0;
+    let totalToken1Usd = 0;
+    const parsedFeeInfo: FeeHistory[] = [];
+    const feeInfo = data.contractFeeEarnings.dailyEarnings;
+    for (const d of feeInfo) {
+      const tokenInfo = await Global.getTokenInfoFromAddr(ContractAddr.from(d.tokenAddress));
+      const amount = Web3Number.fromWei(d.amount, tokenInfo.decimals);
+      if (tokenInfo.address.eq(poolKey.token0)) {
+        totalToken0Amount = totalToken0Amount.plus(amount);
+        totalToken0Usd = totalToken0Usd + amount.multipliedBy(price0.price).toNumber();
+      } else {
+        totalToken1Amount = totalToken1Amount.plus(amount);
+        totalToken1Usd = totalToken1Usd + amount.multipliedBy(price1.price).toNumber();
+      }
+      parsedFeeInfo.push({
+        date: d.date,
+        tokenInfo,
+        amount: Web3Number.fromWei(d.amount, tokenInfo.decimals)
+      });
+    }
+    return {
+      summary: {
+        usdValue: totalToken0Usd + totalToken1Usd,
+        token0: {
+          tokenInfo: token0Info,
+          amount: totalToken0Amount,
+          usdValue: totalToken0Usd
+        },
+        token1: {
+          tokenInfo: token1Info,
+          amount: totalToken1Amount,
+          usdValue: totalToken1Usd
+        }
+      },
+      history: parsedFeeInfo
+    }
+  }
+
+  async netSharesBasedTrueAPY(
     blockIdentifier: BlockIdentifier = "latest",
     sinceBlocks = 600000
   ): Promise<number> {
@@ -354,6 +448,33 @@ export class EkuboCLVault extends BaseStrategy<
     return (apyForGivenBlocks * (365 * 24 * 3600)) / timeDiffSeconds;
   }
 
+  async feeBasedAPY(
+    blockIdentifier: BlockIdentifier = "latest",
+    sinceBlocks = 600000
+  ): Promise<number> {
+    const feeInfo = await this.getFeeHistory('24h');
+    const tvlNow = await this.getTVL('latest');
+    return feeInfo.summary.usdValue * 365 / tvlNow.usdValue;
+  }
+
+  /**
+   * Calculates assets before and now in a given token of TVL per share to observe growth
+   * @returns {Promise<number>} The weighted average APY across all pools
+   */
+  async netAPY(
+    blockIdentifier: BlockIdentifier = "latest",
+    sinceBlocks = 600000
+  ): Promise<number> {
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
+    if (!isUSDCQouteToken) {
+      // good for LSTs and stables
+      return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
+    } else {
+      // good for non-stables
+      return this.feeBasedAPY(blockIdentifier, sinceBlocks);
+    }
+  }
+
   async getHarvestRewardShares(fromBlock: number, toBlock: number) {
     const len = Number(await this.contract.call("get_total_rewards"));
     let shares = Web3Number.fromWei(0, 18);
@@ -1893,7 +2014,7 @@ const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
     Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
   ],
   apyMethodology:
-  "APY based on 7-day historical performance, including fees and rewards.",
+  "Annualized fee APY, calculated as fees earned in the last 24h divided by TVL",
   additionalInfo: {
     newBounds: "Managed by Re7",
     truePrice: 1,
@@ -1913,6 +2034,11 @@ const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
       answer:
         <div>Re7 Labs is the curator of this strategy. Re7 Labs is a well-known Web3 asset management firm. This strategy is completely managed by them, including ownership of the vault. Troves is developer of the smart contracts and maintains infrastructure to help users access these strategies. You can find more information about them on their website <a href='https://www.re7labs.xyz' style={{textDecoration: "underline", marginLeft: "2px"}} target="_blank">here</a>.</div>
     },
+    {
+      question: "How is the APY calculated?",
+      answer:
+        <div>It's an annualized fee APY, calculated as fees earned in the last 24h divided by TVL. Factors like impermanent loss are not considered.</div>
+    },
   ],
   risk: highRisk,
   points: [],

package/src/strategies/universal-strategy.tsx

@@ -317,7 +317,7 @@ export class UniversalStrategy<
     if (legAUM[0].token.address.eq(underlying.address)) {
       vesuAum = vesuAum.plus(legAUM[0].amount);
     } else {
-      vesuAum = vesuAum.plus(legAUM[1].usdValue / tokenUnderlyingPrice.price);
+      vesuAum = vesuAum.plus(legAUM[0].usdValue / tokenUnderlyingPrice.price);
     }
 
     // handle debt
@@ -360,14 +360,14 @@ export class UniversalStrategy<
       amount: zeroAmt,
       usdValue: 0
     };
-    if (vesuAum.isZero()) {
+    const aumToken = vesuAum.plus(balance.amount);
+    if (aumToken.isZero()) {
       return { net, splits: [{
         aum: zeroAmt, id: AUMTypes.FINALISED
       }, {
         aum: zeroAmt, id: AUMTypes.DEFISPRING
       }], prevAum};
     }
-    const aumToken = vesuAum.plus(balance.amount);
     logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
 
     // compute rewards contribution to AUM

package/src/strategies/vesu-rebalance.tsx

@@ -252,18 +252,17 @@ export class VesuRebalance extends BaseStrategy<
   ) {
     const vesuPosition = vesuPositions.find(
       (d: any) =>
-        d.pool.id.toString() ===
-        num.getDecimalString(p.pool_id.address.toString())
+        ContractAddr.from(d.id).eq(p.pool_id)
     );
     const _pool = pools.find((d: any) => {
       logger.verbose(
         `pool check: ${
-          d.id == num.getDecimalString(p.pool_id.address.toString())
+          ContractAddr.from(d.id).eq(p.pool_id)
         }, id: ${d.id}, pool_id: ${num.getDecimalString(
           p.pool_id.address.toString()
         )}`
       );
-      return d.id == num.getDecimalString(p.pool_id.address.toString());
+      return ContractAddr.from(d.id).eq(p.pool_id);
     });
     logger.verbose(`pool: ${JSON.stringify(_pool)}`);
     logger.verbose(typeof _pool);