@strkfarm/sdk 1.1.22 → 1.1.23

package/dist/index.browser.mjs

@@ -15289,6 +15289,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 {
@@ -15446,11 +15457,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);
@@ -15488,6 +15563,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);
@@ -16701,7 +16793,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,
@@ -16722,6 +16814,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,

package/dist/index.d.ts

@@ -642,6 +642,11 @@ interface EkuboBounds {
     lowerTick: bigint;
     upperTick: bigint;
 }
+interface FeeHistory {
+    date: string;
+    tokenInfo: TokenInfo;
+    amount: Web3Number;
+}
 /**
  * Settings for the CLVaultStrategy
  *
@@ -696,6 +701,12 @@ declare class EkuboCLVault extends BaseStrategy<DualTokenInfo, DualActionAmount>
     rebalanceCall(newBounds: EkuboBounds, swapParams: SwapInfo): Call[];
     handleUnusedCall(swapParams: SwapInfo): Call[];
     handleFeesCall(): Call[];
+    getFeeHistory(timePeriod?: '24h' | '30d' | '3m'): Promise<{
+        summary: DualTokenInfo;
+        history: FeeHistory[];
+    }>;
+    netSharesBasedTrueAPY(blockIdentifier?: BlockIdentifier, sinceBlocks?: number): Promise<number>;
+    feeBasedAPY(blockIdentifier?: BlockIdentifier, sinceBlocks?: number): Promise<number>;
     /**
      * 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

package/dist/index.js

@@ -15385,6 +15385,17 @@ var erc4626_abi_default = [
   }
 ];
 
+// src/strategies/ekubo-cl-vault.tsx
+var import_client2 = require("@apollo/client");
+
+// src/modules/apollo-client.ts
+var import_client = require("@apollo/client");
+var apolloClient = new import_client.ApolloClient({
+  uri: "https://api.troves.fi/",
+  cache: new import_client.InMemoryCache()
+});
+var apollo_client_default = apolloClient;
+
 // src/strategies/ekubo-cl-vault.tsx
 var import_jsx_runtime3 = require("react/jsx-runtime");
 var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
@@ -15542,11 +15553,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: import_client2.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);
@@ -15584,6 +15659,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);
@@ -16797,7 +16889,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,
@@ -16818,6 +16910,10 @@ var ETHUSDCRe7Strategy = {
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("a", { href: "https://www.re7labs.xyz", style: { textDecoration: "underline", marginLeft: "2px" }, target: "_blank", children: "here" }),
         "."
       ] })
+    },
+    {
+      question: "How is the APY calculated?",
+      answer: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("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,
@@ -28033,7 +28129,7 @@ var TelegramNotif = class {
 var import_node_telegram_bot_api2 = __toESM(require("node-telegram-bot-api"));
 var TelegramGroupNotif = class {
   constructor(token, groupId, topicId) {
-    this.bot = new import_node_telegram_bot_api2.default(token, { polling: true });
+    this.bot = new import_node_telegram_bot_api2.default(token, { polling: false });
     this.groupId = groupId;
     this.topicId = topicId;
   }

package/dist/index.mjs

@@ -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,
@@ -27936,7 +28032,7 @@ var TelegramNotif = class {
 import TelegramBot2 from "node-telegram-bot-api";
 var TelegramGroupNotif = class {
   constructor(token, groupId, topicId) {
-    this.bot = new TelegramBot2(token, { polling: true });
+    this.bot = new TelegramBot2(token, { polling: false });
     this.groupId = groupId;
     this.topicId = topicId;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.22",
+  "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/telegram-group.ts

@@ -7,7 +7,7 @@ export class TelegramGroupNotif {
     private topicId?: number;
 
     constructor(token: string, groupId: string, topicId?: number) {
-        this.bot = new TelegramBot(token, { polling: true });
+        this.bot = new TelegramBot(token, { polling: false });
         this.groupId = groupId;
         this.topicId = topicId;
     }