@strkfarm/sdk 2.0.0-staging.6 → 2.0.0-staging.61

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

@@ -10,7 +10,6 @@ import {
   IStrategyMetadata,
   RiskFactor,
   RiskType,
-  StrategyCategory,
   StrategyTag,
   TokenInfo,
   VaultPosition,
@@ -18,7 +17,9 @@ import {
   SourceCodeType,
   AccessControlType,
   InstantWithdrawalVault,
+  VaultType,
   StrategyLiveStatus,
+  UnwrapLabsCurator,
 } from "@/interfaces";
 import { PricerBase } from "@/modules/pricerBase";
 import { assert } from "@/utils";
@@ -36,18 +37,23 @@ import EkuboMathAbi from "@/data/ekubo-math.abi.json";
 import ERC4626Abi from "@/data/erc4626.abi.json";
 import { Global } from "@/global";
 import { AvnuWrapper, ERC20, SwapInfo } from "@/modules";
-import { BaseStrategy } from "./base-strategy";
+import {
+  BaseStrategy,
+  SingleTokenInfo,
+  UserPositionCard,
+  UserPositionCardsInput,
+} from "./base-strategy";
 import { DualActionAmount } from "./base-strategy";
 import { DualTokenInfo } from "./base-strategy";
 import { log } from "winston";
 import { EkuboHarvests, HarvestInfo } from "@/modules/harvests";
 import { logger } from "@/utils/logger";
-import { COMMON_CONTRACTS } from "./constants";
 import { DepegRiskLevel, ImpermanentLossLevel, MarketRiskLevel, SmartContractRiskLevel } from "@/interfaces/risks";
 import { from, gql } from "@apollo/client";
 import apolloClient from "@/modules/apollo-client";
 import { binarySearch } from "@/utils/math-utils";
 import { Quote } from "@avnu/avnu-sdk";
+import { MY_ACCESS_CONTROL } from "./constants";
 
 export interface EkuboPoolKey {
   token0: ContractAddr;
@@ -124,7 +130,10 @@ export class EkuboCLVault extends BaseStrategy<
     pricer: PricerBase,
     metadata: IStrategyMetadata<CLVaultStrategySettings>
   ) {
-    super(config);
+    super(config, {
+      depositInputMode: "dual",
+      withdrawInputMode: "dual"
+    });
     this.pricer = pricer;
 
     assert(
@@ -302,7 +311,10 @@ export class EkuboCLVault extends BaseStrategy<
     return [this.contract.populate("handle_fees", [])];
   }
 
-  async getFeeHistory(timePeriod: '24h' | '7d' | '30d' | '3m' = '24h'): Promise<{
+  async getFeeHistory(
+    timePeriod: '24h' | '7d' | '30d' | '3m' | '6m' = '24h',
+    range?: { startTimestamp?: number; endTimestamp?: number }
+  ): Promise<{
     summary: DualTokenInfo,
     history: FeeHistory[]
   }> {
@@ -311,8 +323,15 @@ export class EkuboCLVault extends BaseStrategy<
         query ContractFeeEarnings(
           $timeframe: String!
           $contract: String!
+          $startTimestamp: Float
+          $endTimestamp: Float
         ) {
-          contractFeeEarnings(timeframe: $timeframe, contract: $contract) {
+          contractFeeEarnings(
+            timeframe: $timeframe
+            contract: $contract
+            startTimestamp: $startTimestamp
+            endTimestamp: $endTimestamp
+          ) {
             contract
             dailyEarnings {
               date
@@ -325,7 +344,9 @@ export class EkuboCLVault extends BaseStrategy<
       `,
       variables: {
         timeframe: timePeriod,
-        contract: this.address.address
+        contract: this.address.address,
+        startTimestamp: range?.startTimestamp,
+        endTimestamp: range?.endTimestamp
       },
       fetchPolicy: 'no-cache',
     });
@@ -476,6 +497,17 @@ export class EkuboCLVault extends BaseStrategy<
     return (apyForGivenBlocks * (365 * 24 * 3600)) / timeDiffSeconds;
   }
 
+  /**
+   * Calculate lifetime earnings for a user
+   * Not yet implemented for Ekubo CL Vault strategy
+   */
+  getLifetimeEarnings(
+    userTVL: SingleTokenInfo,
+    investmentFlows: Array<{ amount: string; type: string; timestamp: number; tx_hash: string }>
+  ): any {
+    throw new Error("getLifetimeEarnings is not implemented yet for this strategy");
+  }
+
   /**
    * Calculates realized APY based on TVL per share growth, always valued in USDC.
    * This is a vault-level metric (same for all users) and works for all strategies,
@@ -614,6 +646,55 @@ export class EkuboCLVault extends BaseStrategy<
     */
   }
 
+  async getMaxTVL(): Promise<Web3Number> {
+    // This strategy doesn't have a maxTVL so returning 0 simply
+    return new Web3Number('0', 18);
+  }
+
+  async getUserPositionCards(input: UserPositionCardsInput): Promise<UserPositionCard[]> {
+    const quoteToken = this.metadata.additionalInfo.quoteAsset;
+    const [userTVL, quotePrice] = await Promise.all([
+      this.getUserTVL(input.user),
+      this.pricer.getPrice(quoteToken.symbol),
+    ]);
+
+    const token0IsQuote = userTVL.token0.tokenInfo.address.eq(quoteToken.address);
+    const token1IsQuote = userTVL.token1.tokenInfo.address.eq(quoteToken.address);
+    const token0QuoteAmount = token0IsQuote
+      ? userTVL.token0.amount.toNumber()
+      : userTVL.token0.usdValue / (quotePrice.price || 1);
+    const token1QuoteAmount = token1IsQuote
+      ? userTVL.token1.amount.toNumber()
+      : userTVL.token1.usdValue / (quotePrice.price || 1);
+    const totalQuoteAmount = token0QuoteAmount + token1QuoteAmount;
+    const quoteAmountDisplay = Number.isFinite(totalQuoteAmount)
+      ? totalQuoteAmount.toLocaleString("en-US", {
+          maximumFractionDigits: quoteToken.displayDecimals ?? 2,
+          minimumFractionDigits: 0,
+        })
+      : "0";
+    const allocationValue = `${this.formatTokenAmountForCard(userTVL.token0.amount, userTVL.token0.tokenInfo)} / ${this.formatTokenAmountForCard(userTVL.token1.amount, userTVL.token1.tokenInfo)}`;
+    const allocationSubValue = `${this.formatUSDForCard(userTVL.token0.usdValue)} / ${this.formatUSDForCard(userTVL.token1.usdValue)}`;
+
+    const cards: UserPositionCard[] = [
+      {
+        title: "Your Holdings",
+        tooltip: `${quoteToken.symbol} equivalent value of your Ekubo position`,
+        value: `${quoteAmountDisplay} ${quoteToken.symbol}`,
+        subValue: `≈ ${this.formatUSDForCard(userTVL.usdValue)}`,
+        subValueColor: "positive",
+      },
+      {
+        title: "Holding Allocation",
+        tooltip: "Split of your position between token0 and token1",
+        value: allocationValue,
+        subValue: `≈ ${allocationSubValue}`,
+        subValueColor: "default",
+      },
+    ];
+    return cards;
+  }
+
   async feeBasedAPY(
     timeperiod: '24h' | '7d' | '30d' | '3m' = '24h'
   ): Promise<number> {
@@ -2146,7 +2227,12 @@ export class EkuboCLVault extends BaseStrategy<
   }
 
   async getInvestmentFlows() {
-    const netYield = await this.netAPY();
+    // for LSTs, we use 30d, else 7d for the yield calculation
+    // TODO Make the block compute more dynamic
+    const blocksDiff = this.metadata.additionalInfo.lstContract
+      ? 600000
+      : 600000 / 4;
+    const netYield = await this.netAPY("latest", blocksDiff, "7d" as any);
     const poolKey = await this.getPoolKey();
 
     const linkedFlow: IInvestmentFlow = {
@@ -2305,6 +2391,9 @@ function getLSTFAQs(lstSymbol: string): FAQ[] {
   ]
 }
 
+const vaultTypeDescription = 'Automatically collects fees and rebalances positions on Ekubo to optimize yield';
+const vaultType = VaultType.AUTOMATED_LP;
+
 const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   id: "ekubo_cl_xstrkstrk",
   name: "Ekubo xSTRK/STRK",
@@ -2314,6 +2403,10 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   ),
   launchBlock: 1209881,
   type: "Other",
+  vaultType: {
+    type: vaultType,
+    description: vaultTypeDescription
+  },
   // must be same order as poolKey token0 and token1
   depositTokens: [
     Global.getDefaultTokens().find((t) => t.symbol === "xSTRK")!,
@@ -2321,6 +2414,7 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   ],
   protocols: [_protocol],
   auditUrl: AUDIT_URL,
+  curator: UnwrapLabsCurator,
   risk: {
     riskFactor: _lstPoolRiskFactors,
     netRisk:
@@ -2330,6 +2424,7 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   },
   apyMethodology:
     "APY based on 30-day historical performance, including fees and rewards.",
+  realizedApyMethodology: "The realizedAPY is based on past 14 days performance by the vault",
   additionalInfo: {
     newBounds: {
       lower: -1,
@@ -2347,7 +2442,6 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
     quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "STRK")!,
   },
   settings: {
-    maxTVL: Web3Number.fromWei("0", 18),
     isAudited: true,
     isPaused: false,
     liveStatus: StrategyLiveStatus.ACTIVE,
@@ -2387,18 +2481,17 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
             tab: "withdraw"
         }
     ],
-    tags: [StrategyTag.EKUBO]
+    tags: [StrategyTag.AUTOMATED_LP]
   },
   faqs: getLSTFAQs("xSTRK"),
   points: [{
-    multiplier: 1, 
+    multiplier: 15, 
     logo: 'https://endur.fi/favicon.ico',
     toolTip: "This strategy holds xSTRK and STRK tokens. Earn 1x Endur points on your xSTRK portion of Liquidity. STRK portion will earn Endur's DEX Bonus points. Points can be found on endur.fi.",
   }],
   contractDetails: [],
   investmentSteps: [],
-  category: StrategyCategory.ALL,
-  tags: [StrategyTag.EKUBO],
+  tags: [StrategyTag.AUTOMATED_LP],
   security: {
     auditStatus: AuditStatus.AUDITED,
     sourceCode: {
@@ -2406,14 +2499,17 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
       contractLink: "https://github.com/trovesfi/troves-contracts",
     },
     accessControl: {
-      type: AccessControlType.STANDARD_ACCOUNT,
-      addresses: [ContractAddr.from("0x0")],
-      timeLock: "2 Days",
+      type: AccessControlType.ROLE_BASED_ACCESS,
+      addresses: [MY_ACCESS_CONTROL.address],
     },
   },
   redemptionInfo: {
     instantWithdrawalVault: InstantWithdrawalVault.YES,
+    redemptionsInfo: [],
+    alerts: [],
   },
+  usualTimeToEarnings: null,
+  usualTimeToEarningsDescription: null,
 };
 
 // Helper to create common LST alerts
@@ -2467,7 +2563,7 @@ const getLSTAlerts = () => [
 ];
 
 // Helper to create LST strategy settings
-const createLSTSettings = (quoteTokenSymbol: string, category: StrategyCategory) => ({
+const createLSTSettings = (quoteTokenSymbol: string) => ({
     ...xSTRKSTRK.settings,
     isAudited: true,
     liveStatus: StrategyLiveStatus.ACTIVE,
@@ -2478,8 +2574,7 @@ const createLSTSettings = (quoteTokenSymbol: string, category: StrategyCategory)
         (t) => t.symbol === quoteTokenSymbol
     )!,
     alerts: getLSTAlerts(),
-    tags: [StrategyTag.EKUBO, StrategyTag.ENDUR] as StrategyTag[],
-    category: category
+    tags: [StrategyTag.AUTOMATED_LP] as StrategyTag[],
 });
 
 // Helper to create an LST strategy
@@ -2492,7 +2587,6 @@ const createLSTStrategy = (params: {
     depositToken1Symbol: string;
     quoteTokenSymbol: string;
     lstSymbol: string;
-    category: StrategyCategory;
     lstContractAddress?: string;
 }): IStrategyMetadata<CLVaultStrategySettings> => ({
     ...xSTRKSTRK,
@@ -2502,12 +2596,17 @@ const createLSTStrategy = (params: {
     // must be same order as poolKey token0 and token1
     address: ContractAddr.from(params.address),
     launchBlock: params.launchBlock,
+    vaultType: {
+      type: vaultType,
+      description: vaultTypeDescription
+    },
     depositTokens: [
         Global.getDefaultTokens().find(
             (t) => t.symbol === params.depositToken0Symbol
         )!,
         Global.getDefaultTokens().find((t) => t.symbol === params.depositToken1Symbol)!
     ],
+    realizedApyMethodology: "The realizedAPY is based on past 14 days performance by the vault",
     additionalInfo: {
         ...xSTRKSTRK.additionalInfo,
         quoteAsset: Global.getDefaultTokens().find(
@@ -2518,17 +2617,26 @@ const createLSTStrategy = (params: {
             : Global.getDefaultTokens().find((t) => t.symbol === params.lstSymbol)!
                   .address
     },
-    settings: createLSTSettings(params.quoteTokenSymbol, params.category),
+    settings: createLSTSettings(params.quoteTokenSymbol),
     faqs: getLSTFAQs(params.lstSymbol),
     points: [],
     contractDetails: [],
     investmentSteps: [],
-    category: params.category,
-    tags: [StrategyTag.EKUBO]
+    tags: params.id.toLowerCase().includes('btc') ? [StrategyTag.BTC, StrategyTag.AUTOMATED_LP] : [StrategyTag.AUTOMATED_LP]
 });
 
 const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     xSTRKSTRK,
+    createLSTStrategy({
+        id: "ekubo_cl_xstrkbtcstrkbtc",
+        name: "Ekubo xstrkBTC/strkBTC",
+        address: "0x0129Cd37Ca0027b44c4e0A3A6E8F0e144977C9b8D83bc5F7ee1Ce8985F5B8CbF",
+        launchBlock: 9578786,
+        depositToken0Symbol: "xstrkBTC",
+        depositToken1Symbol: "strkBTC",
+        quoteTokenSymbol: "strkBTC",
+        lstSymbol: "xstrkBTC",
+    }),
     createLSTStrategy({
         id: "ekubo_cl_xwbtcwbtc",
         name: "Ekubo xWBTC/WBTC",
@@ -2538,10 +2646,9 @@ const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         depositToken1Symbol: "xWBTC",
         quoteTokenSymbol: "WBTC",
         lstSymbol: "xWBTC",
-        category: StrategyCategory.BTC
     }),
     createLSTStrategy({
-        id: "ekubo_cl_xtbtcbtc",
+        id: "ekubo_cl_xtbtctbtc",
         name: "Ekubo xtBTC/tBTC",
         address: "0x785dc3dfc4e80ef2690a99512481e3ed3a5266180adda5a47e856245d68a4af",
         launchBlock: 2415667,
@@ -2549,7 +2656,6 @@ const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         depositToken1Symbol: "tBTC",
         quoteTokenSymbol: "tBTC",
         lstSymbol: "xtBTC",
-        category: StrategyCategory.BTC
     }),
     createLSTStrategy({
         id: "ekubo_cl_xsbtcsolvbtc",
@@ -2560,10 +2666,9 @@ const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         depositToken1Symbol: "solvBTC",
         quoteTokenSymbol: "solvBTC",
         lstSymbol: "xsBTC",
-        category: StrategyCategory.BTC
     }),
     createLSTStrategy({
-        id: "ekubo_cl_xlbtcbtc",
+        id: "ekubo_cl_xlbtclbtc",
         name: "Ekubo xLBTC/LBTC",
         address: "0x314c4653ab1aa01f5465773cb879f525d7e369a137bc3ae084761aee99a1712",
         launchBlock: 2412442,
@@ -2571,7 +2676,6 @@ const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         depositToken1Symbol: "xLBTC",
         quoteTokenSymbol: "LBTC",
         lstSymbol: "xLBTC",
-        category: StrategyCategory.BTC
     })
 ];
 
@@ -2609,10 +2713,10 @@ const getRe7Alerts = () => [
 ];
 
 // Helper to create Re7 strategy settings
-const createRe7Settings = (quoteTokenSymbol: string, category: StrategyCategory) => ({
+const createRe7Settings = (quoteTokenSymbol: string, isBTC: boolean, isDeprecated: boolean) => ({
     ...xSTRKSTRK.settings,
     isAudited: true,
-    liveStatus: StrategyLiveStatus.NEW,
+    liveStatus: isDeprecated ? StrategyLiveStatus.DEPRECATED : StrategyLiveStatus.ACTIVE,
     isInstantWithdrawal: true,
     hideNetEarnings: true,
     isTransactionHistDisabled: false,
@@ -2620,8 +2724,7 @@ const createRe7Settings = (quoteTokenSymbol: string, category: StrategyCategory)
         (t) => t.symbol === quoteTokenSymbol
     )!,
     alerts: getRe7Alerts(),
-    tags: [StrategyTag.EKUBO] as StrategyTag[],
-    category: category
+    tags: isBTC ? [StrategyTag.BTC, StrategyTag.AUTOMATED_LP] : [StrategyTag.AUTOMATED_LP] as StrategyTag[]
 });
 
 // Helper to create Re7 FAQs
@@ -2676,44 +2779,60 @@ const createRe7Strategy = (
         | typeof highRisk
         | typeof mediumRisk
         | { riskFactor: RiskFactor[]; netRisk: number; notARisks: RiskType[] },
-    category: StrategyCategory
-): IStrategyMetadata<CLVaultStrategySettings> => ({
-    ...xSTRKSTRK,
-    id,
-    name,
-    description: <></>,
-    address: ContractAddr.from(address),
-    launchBlock,
-    depositTokens: [
-        Global.getDefaultTokens().find(
-            (t) => t.symbol === depositToken0Symbol
-        )!,
-        Global.getDefaultTokens().find((t) => t.symbol === depositToken1Symbol)!
-    ],
-    apyMethodology:
-        "Annualized fee APY, calculated as fees earned in the last 7d divided by TVL",
-    additionalInfo: {
-        newBounds: "Managed by Re7",
-        truePrice: 1,
-        feeBps: 1000,
-        rebalanceConditions: {
-            customShouldRebalance: async (currentPrice: number) =>
-                currentPrice > 0.99 && currentPrice < 1.01,
-            minWaitHours: 6,
-            direction: "any" as const
+    isBTC: boolean
+): IStrategyMetadata<CLVaultStrategySettings> => {
+    const isDeprecated = name.toLowerCase().includes('usdc.e');
+    return {
+        ...xSTRKSTRK,
+        id,
+        name,
+        description: <></>,
+        address: ContractAddr.from(address),
+        launchBlock,
+        vaultType: {
+          type: vaultType,
+          description: vaultTypeDescription
         },
-        quoteAsset: Global.getDefaultTokens().find(
-            (t) => t.symbol === quoteTokenSymbol
-        )!
-    },
-    settings: createRe7Settings(quoteTokenSymbol, category),
-    faqs: getRe7FAQs(),
-    risk,
-    points: [],
-    curator: { name: "Re7 Labs", logo: "https://www.re7labs.xyz/favicon.ico" },
-    tags: [StrategyTag.EKUBO],
-    category: category
-});
+        depositTokens: [
+            Global.getDefaultTokens().find(
+                (t) => t.symbol === depositToken0Symbol
+            )!,
+            Global.getDefaultTokens().find((t) => t.symbol === depositToken1Symbol)!
+        ],
+        apyMethodology:
+            "Annualized fee APY, calculated as fees earned in the last 7d divided by TVL",
+        additionalInfo: {
+            newBounds: "Managed by Re7",
+            truePrice: 1,
+            feeBps: 1000,
+            rebalanceConditions: {
+                customShouldRebalance: async (currentPrice: number) =>
+                    currentPrice > 0.99 && currentPrice < 1.01,
+                minWaitHours: 6,
+                direction: "any" as const
+            },
+            quoteAsset: Global.getDefaultTokens().find(
+                (t) => t.symbol === quoteTokenSymbol
+            )!
+        },
+        settings: createRe7Settings(quoteTokenSymbol, isBTC, isDeprecated),
+        faqs: getRe7FAQs(),
+        risk,
+        points: [],
+        curator: { name: "Re7 Labs", logo: "https://www.re7labs.xyz/favicon.ico" },
+        tags: isBTC ? [StrategyTag.BTC, StrategyTag.AUTOMATED_LP] : [StrategyTag.AUTOMATED_LP] as StrategyTag[],
+        discontinuationInfo: isDeprecated ? {
+            info: "This strategy has been deprecated and is no longer accepting new deposits."
+        } : undefined,
+        security: {
+          ...xSTRKSTRK.security,
+          accessControl: {
+            ...xSTRKSTRK.security.accessControl,
+            addresses: [ContractAddr.from("0x707bf89863473548fb2844c9f3f96d83fe2394453259035a5791e4b1490642")],
+          },
+        },
+    };
+};
 
 const ETHUSDCRe7Strategy = createRe7Strategy(
     "ekubo_cl_ethusdc",
@@ -2724,7 +2843,7 @@ const ETHUSDCRe7Strategy = createRe7Strategy(
     "USDC.e",
     "USDC.e",
     highRisk,
-    StrategyCategory.ALL
+    false // isBTC
 );
 
 const stableCoinRisk = {
@@ -2741,18 +2860,18 @@ const stableCoinRisk = {
 const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     ETHUSDCRe7Strategy,
     createRe7Strategy(
-        "ekubo_cl_usdceusdt",
+        "ekubo_cl_usdcusdt",
         "Ekubo USDC.e/USDT",
         "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2",
         1506139,
         "USDC.e",
         "USDT",
-        "USDT",
+        "USDC.e",
         stableCoinRisk,
-        StrategyCategory.ALL
+        false // isBTC
     ),
     createRe7Strategy(
-        "ekubo_cl_strkusdce",
+        "ekubo_cl_strkusdc",
         "Ekubo STRK/USDC.e",
         "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30",
         1504079,
@@ -2760,7 +2879,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         "USDC.e",
         "USDC.e",
         highRisk,
-        StrategyCategory.ALL
+        false // isBTC
     ),
     createRe7Strategy(
         "ekubo_cl_strketh",
@@ -2769,12 +2888,12 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         1504149,
         "STRK",
         "ETH",
-        "ETH",
+        "USDC",
         highRisk,
-        StrategyCategory.ALL
+        false // isBTC
     ),
     createRe7Strategy(
-        "ekubo_cl_wbtcusdce",
+        "ekubo_cl_wbtcusdc",
         "Ekubo WBTC/USDC.e",
         "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1",
         1506144,
@@ -2782,19 +2901,18 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         "USDC.e",
         "USDC.e",
         mediumRisk,
-        StrategyCategory.BTC
-    ),
-    createRe7Strategy(
-        "ekubo_cl_tbtcusdce",
-        "Ekubo tBTC/USDC.e",
-        "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456",
-        1501764,
-        "tBTC",
-        "USDC.e",
-        "USDC.e",
-        mediumRisk,
-        StrategyCategory.BTC
+        true // isBTC
     ),
+    // createRe7Strategy(
+    //     "ekubo_cl_tbtcusdce",
+    //     "Ekubo tBTC/USDC.e",
+    //     "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456",
+    //     1501764,
+    //     "tBTC",
+    //     "USDC.e",
+    //     "USDC.e",
+    //     mediumRisk,
+    // ),
     createRe7Strategy(
         "ekubo_cl_wbtceth",
         "Ekubo WBTC/ETH",
@@ -2802,9 +2920,9 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         1506145,
         "WBTC",
         "ETH",
-        "ETH",
+        "USDC",
         mediumRisk,
-        StrategyCategory.ALL
+        true // isBTC
     ),
     createRe7Strategy(
         "ekubo_cl_wbtcstrk",
@@ -2813,12 +2931,12 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         1506147,
         "WBTC",
         "STRK",
-        "STRK",
+        "USDC",
         highRisk,
-        StrategyCategory.ALL
+        true // isBTC
     ),
     createRe7Strategy(
-        "ekubo_cl_usdcusdt",
+        "ekubo_cl_usdc_v2usdt",
         "Ekubo USDC/USDT",
         "0x5203a08b471e46bf33990ac83aff577bbe5a5d789e61de2c6531e3c4773d1c9",
         3998018,
@@ -2826,7 +2944,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         "USDT",
         "USDC",
         stableCoinRisk,
-        StrategyCategory.ALL
+        false // isBTC
     ),
     createRe7Strategy(
         "ekubo_cl_ethusdc_v2",
@@ -2837,10 +2955,10 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         "ETH",
         "USDC",
         highRisk,
-        StrategyCategory.ALL
+        false // isBTC
     ),
     createRe7Strategy(
-        "ekubo_cl_strkusdc",
+        "ekubo_cl_strkusdc_v2",
         "Ekubo STRK/USDC",
         "0x4de22bd0a8eb4d0a18736e66dd36d20ba50bc106346bbfac3dbeaac1ab37ce1",
         3998030,
@@ -2848,10 +2966,10 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         "STRK",
         "USDC",
         highRisk,
-        StrategyCategory.ALL
+        false // isBTC
     ),
     createRe7Strategy(
-        "ekubo_cl_wbtcusdc",
+        "ekubo_cl_wbtcusdc_v2",
         "Ekubo WBTC/USDC",
         "0x76101c3b80af1103c9c6d541ca627f61b5ae7ae79d7fce96ccdf7bdb648450d",
         3998034,
@@ -2859,8 +2977,53 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
         "WBTC",
         "USDC",
         mediumRisk,
-        StrategyCategory.BTC
-    )
+        true // isBTC
+    ),
+    createRe7Strategy(
+        "ekubo_cl_strkbtcusdc",
+        "Ekubo strkBTC/USDC",
+        "0x049c1ff7d8d4c60584df57b4f545e36dfc8b99d650fcc12eb7c9bb8f3b1be18f",
+        9578610,
+        "USDC",
+        "strkBTC",
+        "USDC",
+        mediumRisk,
+        true // isBTC
+    ),
+    createRe7Strategy(
+        "ekubo_cl_strkbtcstrk",
+        "Ekubo strkBTC/STRK",
+        "0x016a429ac5ff52f4b33edbefd85b7c457e55d63a92c1cb0ddf18f9830daa70e0",
+        9578610,
+        "STRK",
+        "strkBTC",
+        "USDC",
+        mediumRisk,
+        true // isBTC
+    ),
+    createRe7Strategy(
+        "ekubo_cl_strkbtceth",
+        "Ekubo strkBTC/ETH",
+        "0x02eb2ad36fca2ddb9e28f32f7bbbe24194bac4a60324918c2499f9b41ef53dd8",
+        9578610,
+        "ETH",
+        "strkBTC",
+        "USDC",
+        mediumRisk,
+        true // isBTC
+    ),
+    // wbtc/strkBTC
+    createRe7Strategy(
+        "ekubo_cl_wbtcstrkbtc",
+        "Ekubo WBTC/strkBTC",
+        "0x022656b2135f82ac83e651062f94b4f01a788bd949659b9c26570618d20de8cc",
+        9578610,
+        "WBTC",
+        "strkBTC",
+        "strkBTC",
+        stableCoinRisk,
+        true // isBTC
+    ),
 ];
 
 /**