@strkfarm/sdk 2.0.0-staging.1 → 2.0.0-staging.10

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

@@ -10,7 +10,6 @@ import {
   IStrategyMetadata,
   RiskFactor,
   RiskType,
-  StrategyCategory,
   StrategyTag,
   TokenInfo,
   VaultPosition,
@@ -18,6 +17,8 @@ import {
   SourceCodeType,
   AccessControlType,
   InstantWithdrawalVault,
+  VaultType,
+  StrategyLiveStatus,
 } from "@/interfaces";
 import { PricerBase } from "@/modules/pricerBase";
 import { assert } from "@/utils";
@@ -43,9 +44,10 @@ 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 { gql } from "@apollo/client";
+import { from, gql } from "@apollo/client";
 import apolloClient from "@/modules/apollo-client";
 import { binarySearch } from "@/utils/math-utils";
+import { Quote } from "@avnu/avnu-sdk";
 
 export interface EkuboPoolKey {
   token0: ContractAddr;
@@ -647,7 +649,8 @@ export class EkuboCLVault extends BaseStrategy<
     sinceBlocks = 600000,
     timeperiod: '24h' | '7d' | '30d' | '3m' = '24h' // temp thing for fee based APY
   ): Promise<number> {
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
+    // ! switch to USDC later
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e" || this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
     if (!isUSDCQouteToken) {
       // good for LSTs and stables
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
@@ -1181,6 +1184,12 @@ export class EkuboCLVault extends BaseStrategy<
         amount1: availableAmount1.minus(y),
         ratio: 0,
       };
+    } else if (ratio.eq(Infinity)) {
+      return {
+        amount0: availableAmount0,
+        amount1: Web3Number.fromWei("0", availableAmount1.decimals),
+        ratio: Infinity,
+      };
     }
     return {
       amount0: availableAmount0.plus(x),
@@ -1230,7 +1239,12 @@ export class EkuboCLVault extends BaseStrategy<
     };
   }
 
-  async getSwapInfoToHandleUnused(considerRebalance: boolean = true, newBounds: EkuboBounds | null = null, maxIterations = 20, priceRatioPrecision = 4): Promise<SwapInfo> {
+  async getSwapInfoToHandleUnused(
+    considerRebalance: boolean = true, 
+    newBounds: EkuboBounds | null = null, 
+    maxIterations = 20, priceRatioPrecision = 4, 
+    getQuoteCallback: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote> = this.avnu.getQuotes
+  ): Promise<SwapInfo> {
     const poolKey = await this.getPoolKey();
 
     // fetch current unused balances of vault
@@ -1295,7 +1309,8 @@ export class EkuboCLVault extends BaseStrategy<
       token1Bal,
       ekuboBounds,
       maxIterations,
-      priceRatioPrecision
+      priceRatioPrecision,
+      getQuoteCallback
     );
   }
 
@@ -1341,6 +1356,7 @@ export class EkuboCLVault extends BaseStrategy<
     const tokenToSell = expectedAmounts.amount0.lessThan(token0Bal)
       ? poolKey.token0
       : poolKey.token1;
+    logger.verbose(`getSwapParams => tokenToSell: ${tokenToSell.address}, expectedAmounts: ${expectedAmounts.amount0.toString()}, bal0: ${token0Bal.toString()}`);
     // The other token is the one to buy
     const tokenToBuy =
       tokenToSell == poolKey.token0 ? poolKey.token1 : poolKey.token0;
@@ -1379,7 +1395,8 @@ export class EkuboCLVault extends BaseStrategy<
     token1Bal: Web3Number,
     bounds: EkuboBounds,
     maxIterations: number = 20,
-    priceRatioPrecision: number = 4
+    priceRatioPrecision: number = 4,
+    getQuoteCallback: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote> = this.avnu.getQuotes
   ): Promise<SwapInfo> {
     logger.verbose(
       `${
@@ -1434,12 +1451,7 @@ export class EkuboCLVault extends BaseStrategy<
       }
 
       // Get a quote for swapping the calculated amount
-      const quote = await this.avnu.getQuotes(
-        tokenToSell.address,
-        tokenToBuy.address,
-        amountToSell.toWei(),
-        this.address.address
-      );
+      const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
 
       // If all of the token is to be swapped, return the swap info directly
       if (remainingSellAmount.eq(0)) {
@@ -1549,8 +1561,11 @@ export class EkuboCLVault extends BaseStrategy<
    * @param retry - Current retry attempt number (default 0)
    * @param adjustmentFactor - Percentage to adjust swap amount by (default 1)
    * @param isToken0Deficit - Whether token0 balance needs increasing (default true)
+   * @param MAX_RETRIES - Maximum number of retries (default 40)
+   * @param sameErrorCount - For certain errors, we just retry with same amount again. This is the count of such retries (default { count: 0, error: null })
+   * @param MAX_SAME_ERROR_COUNT - For certain errors, we just retry with same amount again. This limits such retries (default 10)
    * @returns Array of contract calls needed for rebalancing
-   * @throws Error if max retries reached without successful rebalance
+   * @throws Error if max retries reached without successful rebalance or max same errors reached
    */
   async rebalanceIter(
     swapInfo: SwapInfo,
@@ -1560,15 +1575,23 @@ export class EkuboCLVault extends BaseStrategy<
     retry = 0,
     lowerLimit = 0n,
     upperLimit = 0n,
-    MAX_RETRIES = 40
+    MAX_RETRIES = 40,
+    sameErrorCount: { count: number, error: null | string } = { count: 0, error: null },
+    MAX_SAME_ERROR_COUNT = 10
   ): Promise<Call[]> {
 
     logger.verbose(
       `Rebalancing ${this.metadata.name}: ` +
-        `retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}`
+        `retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}, MAX_RETRIES=${MAX_RETRIES}, sameErrorCount=${sameErrorCount.error} (${sameErrorCount.count})`
     );
 
+    if (sameErrorCount.count >= MAX_SAME_ERROR_COUNT) {
+      logger.error(`Rebalance failed after ${MAX_SAME_ERROR_COUNT} same errors`);
+      throw new Error(`Rebalance failed after ${MAX_SAME_ERROR_COUNT} same errors`);
+    }
+
     const fromAmount = uint256.uint256ToBN(swapInfo.token_from_amount);
+    const fromTokenInfo = await Global.getTokenInfoFromAddr(ContractAddr.from(swapInfo.token_from_address));
     logger.verbose(
       `Selling ${fromAmount.toString()} of token ${swapInfo.token_from_address}`
     );
@@ -1588,8 +1611,8 @@ export class EkuboCLVault extends BaseStrategy<
       );
 
       const newSwapInfo = { ...swapInfo };
-      const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18); // 18 is ok, as its toWei eventually anyways
-      logger.verbose(`Current amount: ${currentAmount.toString()}`);
+      const currentAmount = Web3Number.fromWei(fromAmount.toString(), fromTokenInfo.decimals);
+      logger.verbose(`Current amount: ${currentAmount.toString()}, lowerLimit: ${lowerLimit.toString()}, upperLimit: ${upperLimit.toString()}`);
       if (
         err.message.includes("invalid token0 balance") ||
         err.message.includes("invalid token0 amount")
@@ -1642,11 +1665,43 @@ export class EkuboCLVault extends BaseStrategy<
           }
           newSwapInfo.token_from_amount = uint256.bnToUint256(nextAmount);
         }
+      } else if (err.message.includes("Residual tokens")) {
+        logger.error("Residual tokens");
+        if (sameErrorCount.error == "Residual tokens") {
+          sameErrorCount.count++;
+        } else {
+          sameErrorCount.error = "Residual tokens";
+          sameErrorCount.count = 1;
+        }
+        // dont do anything, just try again. 
+      } else if (err.message.includes("Insufficient tokens received")) {
+        logger.error("Insufficient tokens received");
+        if (sameErrorCount.error == "Insufficient tokens received") {
+          sameErrorCount.count++;
+        } else {
+          sameErrorCount.error = "Insufficient tokens received";
+          sameErrorCount.count = 1;
+        }
+        // dont do anything, just try again. 
+      } else if (err.message.includes("Could not reach the end of the program")) {
+        logger.error("Could not reach the end of the program, may be the block is full (could be a temp/permanent gas issue)");
+        if (sameErrorCount.error == "Could not reach the end of the program") {
+          sameErrorCount.count++;
+        } else {
+          sameErrorCount.error = "Could not reach the end of the program";
+          sameErrorCount.count = 1;
+        }
+        // just try again. 
       } else {
         logger.error("Unexpected error:", err);
         throw err;
       }
       newSwapInfo.token_to_min_amount = uint256.bnToUint256("0");
+
+      // if (uint256.uint256ToBN(newSwapInfo.token_from_amount) == fromAmount && sameErrorCount.error == 'loop-stuck') {
+      //   logger.error("Swap amount did not change, cannot proceed");
+      //   sameErrorCount = { count: MAX_SAME_ERROR_COUNT, error: null };
+      // }
       return this.rebalanceIter(
         newSwapInfo,
         acc,
@@ -1654,7 +1709,10 @@ export class EkuboCLVault extends BaseStrategy<
         isSellTokenToken0,
         retry + 1,
         lowerLimit,
-        upperLimit
+        upperLimit,
+        MAX_RETRIES,
+        sameErrorCount,
+        MAX_SAME_ERROR_COUNT
       );
     }
   }
@@ -2088,7 +2146,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 = {
@@ -2248,6 +2311,7 @@ function getLSTFAQs(lstSymbol: string): FAQ[] {
 }
 
 const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
+  id: "ekubo_cl_xstrkstrk",
   name: "Ekubo xSTRK/STRK",
   description: <></>,
   address: ContractAddr.from(
@@ -2255,6 +2319,10 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   ),
   launchBlock: 1209881,
   type: "Other",
+  vaultType: {
+    type: VaultType.FARMING,
+    description: "this is a yield farming vault"
+  },
   // must be same order as poolKey token0 and token1
   depositTokens: [
     Global.getDefaultTokens().find((t) => t.symbol === "xSTRK")!,
@@ -2262,7 +2330,10 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   ],
   protocols: [_protocol],
   auditUrl: AUDIT_URL,
-  maxTVL: Web3Number.fromWei("0", 18),
+  curator: {
+    name: "Unwrap Labs",
+    logo: "https://assets.troves.fi/integrations/unwraplabs/white.png"
+  },
   risk: {
     riskFactor: _lstPoolRiskFactors,
     netRisk:
@@ -2288,6 +2359,49 @@ 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,
+    isInstantWithdrawal: true,
+    hideNetEarnings: true,
+    isTransactionHistDisabled: true,
+    quoteToken: Global.getDefaultTokens().find((t) => t.symbol === "STRK")!,
+    alerts: [
+        {
+            type: "info",
+            text: (
+                <p>
+                    Depending on the current position range and price, your
+                    input amounts are automatically adjusted to nearest
+                    required amounts. If you have insufficient tokens, you
+                    can acquire the required tokens on{" "}
+                    <a
+                        href="https://avnu.fi"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                    >
+                        Avnu
+                    </a>
+                </p>
+            ),
+            tab: "deposit"
+        },
+        {
+            type: "info",
+            text: (
+                <>
+                    Depending on the current position range and price, you
+                    may receive both of the tokens or one of the tokens
+                    depending on the price
+                </>
+            ),
+            tab: "withdraw"
+        }
+    ],
+    tags: [StrategyTag.AUTOMATED_LP]
+  },
   faqs: getLSTFAQs("xSTRK"),
   points: [{
     multiplier: 1, 
@@ -2296,8 +2410,7 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   }],
   contractDetails: [],
   investmentSteps: [],
-  category: StrategyCategory.ALL,
-  tags: [StrategyTag.EKUBO],
+  tags: [StrategyTag.AUTOMATED_LP],
   security: {
     auditStatus: AuditStatus.AUDITED,
     sourceCode: {
@@ -2315,284 +2428,449 @@ const xSTRKSTRK: IStrategyMetadata<CLVaultStrategySettings> = {
   },
 };
 
-const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
-  xSTRKSTRK,
-  {
-    ...xSTRKSTRK,
-    name: "Ekubo xWBTC/WBTC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x2ea99b4971d3c277fa4a9b4beb7d4d7d169e683393a29eef263d5d57b4380a"
-    ),
-    launchBlock: 2338309,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "xWBTC")!,
-    ],
-    additionalInfo: {
-      ...xSTRKSTRK.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-      lstContract: Global.getDefaultTokens().find((t) => t.symbol === "xWBTC")!.address,
+// Helper to create common LST alerts
+const getLSTAlerts = () => [
+    {
+        tab: "deposit" as const,
+        text: (
+            <>
+                To acquire the LST, please visit{" "}
+                <a
+                    href="https://app.endur.fi"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                >
+                    endur.fi
+                </a>
+            </>
+        ),
+        type: "info" as const
     },
-    faqs: getLSTFAQs("xWBTC"),
-    points: [],
-    contractDetails: [],
-    investmentSteps: [],
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...xSTRKSTRK,
-    name: "Ekubo xtBTC/tBTC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x785dc3dfc4e80ef2690a99512481e3ed3a5266180adda5a47e856245d68a4af"
-    ),
-    launchBlock: 2415667,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "xtBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "tBTC")!,
-    ],
-    additionalInfo: {
-      ...xSTRKSTRK.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "tBTC")!,
-      lstContract: Global.getDefaultTokens().find((t) => t.symbol === "xtBTC")!.address,
+    {
+        type: "info" as const,
+        text: (
+            <p>
+                Depending on the current position range and price, your input
+                amounts are automatically adjusted to nearest required amounts.
+                If you have insufficient tokens, you can acquire the required
+                tokens on{" "}
+                <a
+                    href="https://avnu.fi"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                >
+                    Avnu
+                </a>
+            </p>
+        ),
+        tab: "deposit" as const
     },
-    faqs: getLSTFAQs("xtBTC"),
-    points: [],
-    contractDetails: [],
-    investmentSteps: [],
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
+    {
+        type: "info" as const,
+        text: (
+            <>
+                Depending on the current position range and price, you may
+                receive both of the tokens or one of the tokens depending on the
+                price
+            </>
+        ),
+        tab: "withdraw" as const
+    }
+];
+
+// Helper to create LST strategy settings
+const createLSTSettings = (quoteTokenSymbol: string) => ({
+    ...xSTRKSTRK.settings,
+    isAudited: true,
+    liveStatus: StrategyLiveStatus.ACTIVE,
+    isInstantWithdrawal: true,
+    hideNetEarnings: true,
+    isTransactionHistDisabled: true,
+    quoteToken: Global.getDefaultTokens().find(
+        (t) => t.symbol === quoteTokenSymbol
+    )!,
+    alerts: getLSTAlerts(),
+    tags: [StrategyTag.AUTOMATED_LP] as StrategyTag[],
+});
+
+// Helper to create an LST strategy
+const createLSTStrategy = (params: {
+    id: string;
+    name: string;
+    address: string;
+    launchBlock: number;
+    depositToken0Symbol: string;
+    depositToken1Symbol: string;
+    quoteTokenSymbol: string;
+    lstSymbol: string;
+    lstContractAddress?: string;
+}): IStrategyMetadata<CLVaultStrategySettings> => ({
     ...xSTRKSTRK,
-    name: "Ekubo xsBTC/solvBTC",
+    id: params.id,
+    name: params.name,
     description: <></>,
-    address: ContractAddr.from(
-      "0x3af1c7faa7c464cf2c494e988972ad1939f1103dbfb6e47e9bf0c47e49b14ef"
-    ),
-    launchBlock: 2344809,
     // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "xsBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "solvBTC")!,
-    ],
-    additionalInfo: {
-      ...xSTRKSTRK.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "solvBTC")!,
-      lstContract: Global.getDefaultTokens().find((t) => t.symbol === "xsBTC")!.address,
+    address: ContractAddr.from(params.address),
+    launchBlock: params.launchBlock,
+    vaultType: {
+      type: VaultType.FARMING,
+      description: "this is a yield farming vault"
     },
-    faqs: getLSTFAQs("xsBTC"),
-    points: [],
-    contractDetails: [],
-    investmentSteps: [],
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...xSTRKSTRK,
-    name: "Ekubo xLBTC/LBTC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x314c4653ab1aa01f5465773cb879f525d7e369a137bc3ae084761aee99a1712"
-    ),
-    launchBlock: 2412442,
-    // must be same order as poolKey token0 and token1
     depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "LBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "xLBTC")!,
+        Global.getDefaultTokens().find(
+            (t) => t.symbol === params.depositToken0Symbol
+        )!,
+        Global.getDefaultTokens().find((t) => t.symbol === params.depositToken1Symbol)!
     ],
     additionalInfo: {
-      ...xSTRKSTRK.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "LBTC")!,
-      lstContract: Global.getDefaultTokens().find((t) => t.symbol === "xLBTC")!.address,
+        ...xSTRKSTRK.additionalInfo,
+        quoteAsset: Global.getDefaultTokens().find(
+            (t) => t.symbol === params.quoteTokenSymbol
+        )!,
+        lstContract: params.lstContractAddress
+            ? ContractAddr.from(params.lstContractAddress)
+            : Global.getDefaultTokens().find((t) => t.symbol === params.lstSymbol)!
+                  .address
     },
-    faqs: getLSTFAQs("xLBTC"),
+    settings: createLSTSettings(params.quoteTokenSymbol),
+    faqs: getLSTFAQs(params.lstSymbol),
     points: [],
     contractDetails: [],
     investmentSteps: [],
-    category: StrategyCategory.BTC,
-    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_xwbtcwbtc",
+        name: "Ekubo xWBTC/WBTC",
+        address: "0x2ea99b4971d3c277fa4a9b4beb7d4d7d169e683393a29eef263d5d57b4380a",
+        launchBlock: 2338309,
+        depositToken0Symbol: "WBTC",
+        depositToken1Symbol: "xWBTC",
+        quoteTokenSymbol: "WBTC",
+        lstSymbol: "xWBTC",
+    }),
+    createLSTStrategy({
+        id: "ekubo_cl_xtbtctbtc",
+        name: "Ekubo xtBTC/tBTC",
+        address: "0x785dc3dfc4e80ef2690a99512481e3ed3a5266180adda5a47e856245d68a4af",
+        launchBlock: 2415667,
+        depositToken0Symbol: "xtBTC",
+        depositToken1Symbol: "tBTC",
+        quoteTokenSymbol: "tBTC",
+        lstSymbol: "xtBTC",
+    }),
+    createLSTStrategy({
+        id: "ekubo_cl_xsbtcsolvbtc",
+        name: "Ekubo xsBTC/solvBTC",
+        address: "0x3af1c7faa7c464cf2c494e988972ad1939f1103dbfb6e47e9bf0c47e49b14ef",
+        launchBlock: 2344809,
+        depositToken0Symbol: "xsBTC",
+        depositToken1Symbol: "solvBTC",
+        quoteTokenSymbol: "solvBTC",
+        lstSymbol: "xsBTC",
+    }),
+    createLSTStrategy({
+        id: "ekubo_cl_xlbtclbtc",
+        name: "Ekubo xLBTC/LBTC",
+        address: "0x314c4653ab1aa01f5465773cb879f525d7e369a137bc3ae084761aee99a1712",
+        launchBlock: 2412442,
+        depositToken0Symbol: "LBTC",
+        depositToken1Symbol: "xLBTC",
+        quoteTokenSymbol: "LBTC",
+        lstSymbol: "xLBTC",
+    })
 ];
 
-const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
-  ...xSTRKSTRK,
-  name: "Ekubo ETH/USDC",
-  description: <></>,
-  address: ContractAddr.from(
-    "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947"
-  ),
-  launchBlock: 1504232,
-  // must be same order as poolKey token0 and token1
-  depositTokens: [
-    Global.getDefaultTokens().find((t) => t.symbol === "ETH")!,
-    Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
-  ],
-  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"
+const getRe7Alerts = () => [
+    {
+        type: "info" as const,
+        text: (
+            <p>
+                Depending on the current position range and price, your input
+                amounts are automatically adjusted to nearest required amounts.
+                If you have insufficient tokens, you can acquire the required
+                tokens on{" "}
+                <a
+                    href="https://avnu.fi"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                >
+                    Avnu
+                </a>
+            </p>
+        ),
+        tab: "deposit" as const
     },
-    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-  },
-  faqs: [
+    {
+        type: "info" as const,
+        text: (
+            <>
+                Depending on the current position range and price, you may
+                receive both of the tokens or one of the tokens depending on the
+                price
+            </>
+        ),
+        tab: "withdraw" as const
+    }
+];
+
+// Helper to create Re7 strategy settings
+const createRe7Settings = (quoteTokenSymbol: string, isBTC: boolean, isDeprecated: boolean) => ({
+    ...xSTRKSTRK.settings,
+    isAudited: true,
+    liveStatus: isDeprecated ? StrategyLiveStatus.DEPRECATED : StrategyLiveStatus.ACTIVE,
+    isInstantWithdrawal: true,
+    hideNetEarnings: true,
+    isTransactionHistDisabled: false,
+    quoteToken: Global.getDefaultTokens().find(
+        (t) => t.symbol === quoteTokenSymbol
+    )!,
+    alerts: getRe7Alerts(),
+    tags: isBTC ? [StrategyTag.BTC, StrategyTag.AUTOMATED_LP] : [StrategyTag.AUTOMATED_LP] as StrategyTag[],
+});
+
+// Helper to create Re7 FAQs
+const getRe7FAQs = () => [
     ...faqs,
     {
-      question: "Who is the curator of this strategy?",
-      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: "Who is the curator of this strategy?",
+        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: [],
-  curator: { name: "Re7 Labs", logo: "https://www.re7labs.xyz/favicon.ico" },
-  category: StrategyCategory.ALL,
-  tags: [StrategyTag.EKUBO],
-};
+        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>
+        )
+    }
+];
 
-const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
-  ETHUSDCRe7Strategy,
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC/USDT",
+// Helper to create a Re7 strategy
+const createRe7Strategy = (
+    id: string,
+    name: string,
+    address: string,
+    launchBlock: number,
+    depositToken0Symbol: string,
+    depositToken1Symbol: string,
+    quoteTokenSymbol: string,
+    risk:
+        | typeof highRisk
+        | typeof mediumRisk
+        | { riskFactor: RiskFactor[]; netRisk: number; notARisks: RiskType[] },
+    isBTC: boolean
+): IStrategyMetadata<CLVaultStrategySettings> => ({
+    ...xSTRKSTRK,
+    id,
+    name,
     description: <></>,
-    address: ContractAddr.from(
-      "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2"
-    ),
-    launchBlock: 1506139,
-    // must be same order as poolKey token0 and token1
+    address: ContractAddr.from(address),
+    launchBlock,
+    vaultType: {
+      type: VaultType.FARMING,
+      description: "this is a yield farming vault"
+    },
     depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDT")!
+        Global.getDefaultTokens().find(
+            (t) => t.symbol === depositToken0Symbol
+        )!,
+        Global.getDefaultTokens().find((t) => t.symbol === depositToken1Symbol)!
     ],
-    risk: {
-      riskFactor: _stableCoinPoolRiskFactors,
-      netRisk:
-      _stableCoinPoolRiskFactors.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
-      _stableCoinPoolRiskFactors.reduce((acc, curr) => acc + curr.weight, 0),
-      notARisks: getNoRiskTags(_stableCoinPoolRiskFactors),
+    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
+        )!
     },
-    category: StrategyCategory.ALL,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30"
+    settings: createRe7Settings(quoteTokenSymbol, isBTC, name.toLowerCase().includes('usdc.e')),
+    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[],
+});
+
+const ETHUSDCRe7Strategy = createRe7Strategy(
+    "ekubo_cl_ethusdc",
+    "Ekubo ETH/USDC.e",
+    "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947",
+    1504232,
+    "ETH",
+    "USDC.e",
+    "USDC.e",
+    highRisk,
+    false // isBTC
+);
+
+const stableCoinRisk = {
+    riskFactor: _stableCoinPoolRiskFactors,
+    netRisk:
+        _stableCoinPoolRiskFactors.reduce(
+            (acc, curr) => acc + curr.value * curr.weight,
+            0
+        ) /
+        _stableCoinPoolRiskFactors.reduce((acc, curr) => acc + curr.weight, 0),
+    notARisks: getNoRiskTags(_stableCoinPoolRiskFactors)
+};
+
+const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
+    ETHUSDCRe7Strategy,
+    createRe7Strategy(
+        "ekubo_cl_usdcusdt",
+        "Ekubo USDC.e/USDT",
+        "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2",
+        1506139,
+        "USDC.e",
+        "USDT",
+        "USDC.e",
+        stableCoinRisk,
+        false // isBTC
     ),
-    launchBlock: 1504079,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "STRK")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
-    ],
-    risk: highRisk,
-    category: StrategyCategory.ALL,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/ETH",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x4ce3024b0ee879009112d7b0e073f8a87153dd35b029347d4247ffe48d28f51"
+    createRe7Strategy(
+        "ekubo_cl_strkusdc",
+        "Ekubo STRK/USDC.e",
+        "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30",
+        1504079,
+        "STRK",
+        "USDC.e",
+        "USDC.e",
+        highRisk,
+        false // isBTC
     ),
-    launchBlock: 1504149,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "STRK")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "ETH")!
-    ],
-    risk: highRisk,
-    category: StrategyCategory.ALL,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1"
+    createRe7Strategy(
+        "ekubo_cl_strketh",
+        "Ekubo STRK/ETH",
+        "0x4ce3024b0ee879009112d7b0e073f8a87153dd35b029347d4247ffe48d28f51",
+        1504149,
+        "STRK",
+        "ETH",
+        "USDC",
+        highRisk,
+        false // isBTC
     ),
-    launchBlock: 1506144,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
-    ],
-    risk: mediumRisk,
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo tBTC/USDC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456"
+    createRe7Strategy(
+        "ekubo_cl_wbtcusdc",
+        "Ekubo WBTC/USDC.e",
+        "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1",
+        1506144,
+        "WBTC",
+        "USDC.e",
+        "USDC.e",
+        mediumRisk,
+        true // isBTC
     ),
-    launchBlock: 1501764,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "tBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
-    ],
-    risk: mediumRisk,
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/ETH",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x1c9232b8186d9317652f05055615f18a120c2ad9e5ee96c39e031c257fb945b"
+    // createRe7Strategy(
+    //     "ekubo_cl_tbtcusdce",
+    //     "Ekubo tBTC/USDC.e",
+    //     "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456",
+    //     1501764,
+    //     "tBTC",
+    //     "USDC.e",
+    //     "USDC.e",
+    //     mediumRisk,
+    // ),
+    createRe7Strategy(
+        "ekubo_cl_wbtceth",
+        "Ekubo WBTC/ETH",
+        "0x1c9232b8186d9317652f05055615f18a120c2ad9e5ee96c39e031c257fb945b",
+        1506145,
+        "WBTC",
+        "ETH",
+        "USDC",
+        mediumRisk,
+        true // isBTC
     ),
-    launchBlock: 1506145,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "ETH")!
-    ],
-    risk: mediumRisk,
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/STRK",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x1248e385c23a929a015ec298a26560fa7745bbd6e41a886550e337b02714b1b"
+    createRe7Strategy(
+        "ekubo_cl_wbtcstrk",
+        "Ekubo WBTC/STRK",
+        "0x1248e385c23a929a015ec298a26560fa7745bbd6e41a886550e337b02714b1b",
+        1506147,
+        "WBTC",
+        "STRK",
+        "USDC",
+        highRisk,
+        true // isBTC
     ),
-    launchBlock: 1506147,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "STRK")!
-    ],
-    risk: highRisk,
-    category: StrategyCategory.BTC,
-    tags: [StrategyTag.EKUBO],
-  }
+    createRe7Strategy(
+        "ekubo_cl_usdc_v2usdt",
+        "Ekubo USDC/USDT",
+        "0x5203a08b471e46bf33990ac83aff577bbe5a5d789e61de2c6531e3c4773d1c9",
+        3998018,
+        "USDC",
+        "USDT",
+        "USDC",
+        stableCoinRisk,
+        false // isBTC
+    ),
+    createRe7Strategy(
+        "ekubo_cl_ethusdc_v2",
+        "Ekubo ETH/USDC",
+        "0x4d00c7423b3c0fae3640f6099ac97acbfd8708f099e09bfe3a7a6a680399228",
+        3998025,
+        "USDC",
+        "ETH",
+        "USDC",
+        highRisk,
+        false // isBTC
+    ),
+    createRe7Strategy(
+        "ekubo_cl_strkusdc_v2",
+        "Ekubo STRK/USDC",
+        "0x4de22bd0a8eb4d0a18736e66dd36d20ba50bc106346bbfac3dbeaac1ab37ce1",
+        3998030,
+        "USDC",
+        "STRK",
+        "USDC",
+        highRisk,
+        false // isBTC
+    ),
+    createRe7Strategy(
+        "ekubo_cl_wbtcusdc_v2",
+        "Ekubo WBTC/USDC",
+        "0x76101c3b80af1103c9c6d541ca627f61b5ae7ae79d7fce96ccdf7bdb648450d",
+        3998034,
+        "USDC",
+        "WBTC",
+        "USDC",
+        mediumRisk,
+        true // isBTC
+    )
 ];
 
 /**