@strkfarm/sdk 1.1.70 → 2.0.0-dev.2

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

@@ -8,6 +8,7 @@ import {
   IInvestmentFlow,
   IProtocol,
   IStrategyMetadata,
+  Protocols,
   RiskFactor,
   RiskType,
   TokenInfo,
@@ -29,7 +30,7 @@ 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 { APYInfo, BaseStrategy, SingleTokenInfo } from "./base-strategy";
 import { DualActionAmount } from "./base-strategy";
 import { DualTokenInfo } from "./base-strategy";
 import { log } from "winston";
@@ -37,10 +38,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 { from, gql } from "@apollo/client";
+import { gql } from "@apollo/client";
 import apolloClient from "@/modules/apollo-client";
 import { binarySearch } from "@/utils/math-utils";
-import { Quote } from "@avnu/avnu-sdk";
+import { PositionInfo } from "./universal-adapters/baseAdapter";
 
 export interface EkuboPoolKey {
   token0: ContractAddr;
@@ -417,41 +418,22 @@ export class EkuboCLVault extends BaseStrategy<
     const tvlBefore = await this._getTVL(blockBefore);
     const supplyBefore = await this.totalSupply(blockBefore);
     const priceBefore = await this.getCurrentPrice(blockBefore);
-    const poolKey = await this.getPoolKey(blockBefore);
-    logger.verbose(`priceBefore: ${priceBefore.price.toString()}`);
-    logger.verbose(`priceNow: ${priceNow.price.toString()}`);
-    logger.verbose(`tvlBefore: ${JSON.stringify(tvlBefore)}`);
-    logger.verbose(`tvlNow: ${JSON.stringify(tvlNow)}`);
-
-    const isQuoteTokenToken0 = this.metadata.additionalInfo.quoteAsset.address.eq(poolKey.token0);
-    logger.verbose(`isQuoteTokenToken0: ${isQuoteTokenToken0}`);
-    let tvlBeforeInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
-    let tvlNowInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
-    if (!isQuoteTokenToken0) {
-      tvlNowInBaseAsset = (tvlNow.amount0
-        .multipliedBy(priceNow.price))
-        .plus(tvlNow.amount1);
-      tvlBeforeInBaseAsset = (tvlBefore.amount0
-        .multipliedBy(priceBefore.price))
-        .plus(tvlBefore.amount1);
-    } else {
-      tvlNowInBaseAsset = (tvlNow.amount1
-        .multipliedBy(1 / priceNow.price))
-        .plus(tvlNow.amount0);
-      tvlBeforeInBaseAsset = (tvlBefore.amount1
-        .multipliedBy(1 / priceBefore.price))
-        .plus(tvlBefore.amount0);
-    }
-    const tvlPerShareNow = tvlNowInBaseAsset
+
+    const tvlInToken0Now = (tvlNow.amount0
+      .multipliedBy(priceNow.price))
+      .plus(tvlNow.amount1);
+    const tvlPerShareNow = tvlInToken0Now
       .multipliedBy(1e18)
       .dividedBy(adjustedSupplyNow.toString());
-
-    const tvlPerShareBf = tvlBeforeInBaseAsset
+    const tvlInToken0Bf = (tvlBefore.amount0
+      .multipliedBy(priceBefore.price))
+      .plus(tvlBefore.amount1);
+    const tvlPerShareBf = tvlInToken0Bf
       .multipliedBy(1e18)
       .dividedBy(supplyBefore.toString());
     const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
-    logger.verbose(`tvlNowInBaseAsset: ${tvlNowInBaseAsset.toString()}`);
-    logger.verbose(`tvlBeforeInBaseAsset: ${tvlBeforeInBaseAsset.toString()}`);
+    logger.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
+    logger.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
     logger.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
     logger.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
     logger.verbose(`Price before: ${priceBefore.price.toString()}`);
@@ -503,15 +485,20 @@ export class EkuboCLVault extends BaseStrategy<
     blockIdentifier: BlockIdentifier = "latest",
     sinceBlocks = 600000,
     timeperiod: '24h' | '7d' | '30d' | '3m' = '24h' // temp thing for fee based APY
-  ): Promise<number> {
-    // ! switch to USDC later
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e";
+  ): Promise<APYInfo> {
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
     if (!isUSDCQouteToken) {
       // good for LSTs and stables
-      return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
+        return {
+        net: await this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks),
+        splits: []
+      };
     } else {
       // good for non-stables
-      return this.feeBasedAPY(timeperiod);
+      return {
+        net: await this.feeBasedAPY(timeperiod),
+        splits: []
+      };
     }
   }
 
@@ -798,37 +785,43 @@ export class EkuboCLVault extends BaseStrategy<
         amount: tvlInfo.token0.amount,
         usdValue: tvlInfo.token0.usdValue,
         token: tvlInfo.token0.tokenInfo,
-        remarks: `Liquidity in Ekubo`
+        remarks: `Liquidity in Ekubo`,
+        protocol: Protocols.EKUBO
       },
       {
         amount: fees.token0.amount,
         usdValue: fees.token0.usdValue,
         token: fees.token0.tokenInfo,
-        remarks: "Uncollected Fees in Ekubo"
+        remarks: "Uncollected Fees in Ekubo",
+        protocol: Protocols.EKUBO
       },
       {
         amount: unusedBalance.token0.amount,
         usdValue: unusedBalance.token0.usdValue,
         token: unusedBalance.token0.tokenInfo,
-        remarks: "Unused Balance in the Vault"
+        remarks: "Unused Balance in the Vault",
+        protocol: Protocols.NONE
       },
       {
         amount: tvlInfo.token1.amount,
         usdValue: tvlInfo.token1.usdValue,
         token: tvlInfo.token1.tokenInfo,
-        remarks: "Liquidity in Ekubo"
+        remarks: "Liquidity in Ekubo",
+        protocol: Protocols.EKUBO
       },
       {
         amount: fees.token1.amount,
         usdValue: fees.token1.usdValue,
         token: fees.token1.tokenInfo,
-        remarks: "Uncollected Fees in Ekubo"
+        remarks: "Uncollected Fees in Ekubo",
+        protocol: Protocols.EKUBO
       },
       {
         amount: unusedBalance.token1.amount,
         usdValue: unusedBalance.token1.usdValue,
         token: unusedBalance.token1.tokenInfo,
-        remarks: "Unused Balance in the Vault" 
+        remarks: "Unused Balance in the Vault",
+        protocol: Protocols.NONE
       }
     ];
   }
@@ -1033,12 +1026,6 @@ 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),
@@ -1088,12 +1075,7 @@ export class EkuboCLVault extends BaseStrategy<
     };
   }
 
-  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> {
+  async getSwapInfoToHandleUnused(considerRebalance: boolean = true, newBounds: EkuboBounds | null = null, maxIterations = 20, priceRatioPrecision = 4): Promise<SwapInfo> {
     const poolKey = await this.getPoolKey();
 
     // fetch current unused balances of vault
@@ -1158,8 +1140,7 @@ export class EkuboCLVault extends BaseStrategy<
       token1Bal,
       ekuboBounds,
       maxIterations,
-      priceRatioPrecision,
-      getQuoteCallback
+      priceRatioPrecision
     );
   }
 
@@ -1205,7 +1186,6 @@ 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;
@@ -1244,8 +1224,7 @@ export class EkuboCLVault extends BaseStrategy<
     token1Bal: Web3Number,
     bounds: EkuboBounds,
     maxIterations: number = 20,
-    priceRatioPrecision: number = 4,
-    getQuoteCallback: (tokenToSell: string, tokenToBuy: string, amountWei: string, beneficiary: string) => Promise<Quote> = this.avnu.getQuotes
+    priceRatioPrecision: number = 4
   ): Promise<SwapInfo> {
     logger.verbose(
       `${
@@ -1300,7 +1279,12 @@ export class EkuboCLVault extends BaseStrategy<
       }
 
       // Get a quote for swapping the calculated amount
-      const quote = await getQuoteCallback(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
+      const quote = await this.avnu.getQuotes(
+        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)) {
@@ -1410,11 +1394,8 @@ 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 or max same errors reached
+   * @throws Error if max retries reached without successful rebalance
    */
   async rebalanceIter(
     swapInfo: SwapInfo,
@@ -1424,23 +1405,15 @@ export class EkuboCLVault extends BaseStrategy<
     retry = 0,
     lowerLimit = 0n,
     upperLimit = 0n,
-    MAX_RETRIES = 40,
-    sameErrorCount: { count: number, error: null | string } = { count: 0, error: null },
-    MAX_SAME_ERROR_COUNT = 10
+    MAX_RETRIES = 40
   ): Promise<Call[]> {
 
     logger.verbose(
       `Rebalancing ${this.metadata.name}: ` +
-        `retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}, MAX_RETRIES=${MAX_RETRIES}, sameErrorCount=${sameErrorCount.error} (${sameErrorCount.count})`
+        `retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}`
     );
 
-    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}`
     );
@@ -1460,8 +1433,8 @@ export class EkuboCLVault extends BaseStrategy<
       );
 
       const newSwapInfo = { ...swapInfo };
-      const currentAmount = Web3Number.fromWei(fromAmount.toString(), fromTokenInfo.decimals);
-      logger.verbose(`Current amount: ${currentAmount.toString()}, lowerLimit: ${lowerLimit.toString()}, upperLimit: ${upperLimit.toString()}`);
+      const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18); // 18 is ok, as its toWei eventually anyways
+      logger.verbose(`Current amount: ${currentAmount.toString()}`);
       if (
         err.message.includes("invalid token0 balance") ||
         err.message.includes("invalid token0 amount")
@@ -1514,43 +1487,11 @@ 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,
@@ -1558,10 +1499,7 @@ export class EkuboCLVault extends BaseStrategy<
         isSellTokenToken0,
         retry + 1,
         lowerLimit,
-        upperLimit,
-        MAX_RETRIES,
-        sameErrorCount,
-        MAX_SAME_ERROR_COUNT
+        upperLimit
       );
     }
   }
@@ -1654,34 +1592,20 @@ export class EkuboCLVault extends BaseStrategy<
     };
   }
 
-  async getPendingRewards(): Promise<HarvestInfo[]> {
+  async harvest(acc: Account, maxIterations = 20, priceRatioPrecision = 4): Promise<Call[]> {
     const ekuboHarvests = new EkuboHarvests(this.config);
-    return await ekuboHarvests.getUnHarvestedRewards(this.address);
-  }
-
-  async harvest(acc: Account, maxIterations = 20, priceRatioPrecision = 4, minRewardAmount: Web3Number = new Web3Number(0, 18)): Promise<Call[]> {
-    const _pendingRewards = await this.getPendingRewards();
-    const pendingRewards = _pendingRewards.filter(claim => claim.actualReward.greaterThanOrEqualTo(minRewardAmount));
-    if (pendingRewards.length == 0) {
-      logger.verbose(`${EkuboCLVault.name}: harvest => no pending rewards found`);
-      return [];
-    }
-    // get necessary info for the harvest
+    const unClaimedRewards = await ekuboHarvests.getUnHarvestedRewards(
+      this.address
+    );
     const poolKey = await this.getPoolKey();
     const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
     const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
     const bounds = await this.getCurrentBounds();
     logger.verbose(
-      `${EkuboCLVault.name}: harvest => unClaimedRewards: ${pendingRewards.length}`
+      `${EkuboCLVault.name}: harvest => unClaimedRewards: ${unClaimedRewards.length}`
     );
-
-    // execute the harvest
     const calls: Call[] = [];
-    // do one at a time. 
-    const chosenClaim = pendingRewards[0];
-    logger.info(`${EkuboCLVault.name}: harvest => doing one at a time`);
-    logger.info(`${EkuboCLVault.name}: harvest => chosenClaim -> Claim ID: ${chosenClaim.claim.id}, Amount: ${chosenClaim.claim.amount.toString()}, actualAmount: ${chosenClaim.actualReward.toString()}, addr: ${chosenClaim.claim.claimee.toString()}`);
-    for (let claim of [chosenClaim]) {
+    for (let claim of unClaimedRewards) {
       const fee = claim.claim.amount
         .multipliedBy(this.metadata.additionalInfo.feeBps)
         .dividedBy(10000);
@@ -1754,50 +1678,60 @@ export class EkuboCLVault extends BaseStrategy<
     logger.verbose(
       `${
         EkuboCLVault.name
-      }: harvest => token0Amt: ${token0Amt.toFixed(18)}, token1Amt: ${token1Amt.toFixed(18)}`
+      }: harvest => token0Amt: ${token0Amt.toString()}, token1Amt: ${token1Amt.toString()}`
+    );
+
+    // THis function cannot handle swapping of non-STRK pool,
+    // bcz atleast one of token0Amt or token1Amt are in STRK terms. 
+    const swapInfo = await this.getSwapInfoGivenAmounts(
+      poolKey,
+      token0Amt,
+      token1Amt,
+      bounds,
+      maxIterations,
+      priceRatioPrecision
+    );
+    swapInfo.token_to_address = token0Info.address.address;
+    logger.verbose(
+      `${EkuboCLVault.name}: harvest => swapInfo: ${JSON.stringify(swapInfo)}`
     );
 
     logger.verbose(
       `${EkuboCLVault.name}: harvest => claim: ${JSON.stringify(claim)}`
     );
-    const claimTokenInfo = await Global.getTokenInfoFromAddr(claim.token);
-    const harvestEstimateCall = async (baseSwapInfo: SwapInfo) => {
-      // - the base swap if actual swap from claim token to non-claim token
-      // - the other swap is just claim token to claim token (e.g. STRK to STRK)
-      // which is just dummy
-      let baseSwapAmount = Web3Number.fromWei(
-        uint256.uint256ToBN(baseSwapInfo.token_from_amount).toString(),
-        claimTokenInfo.decimals
+    const harvestEstimateCall = async (swapInfo1: SwapInfo) => {
+      const swap1Amount = Web3Number.fromWei(
+        uint256.uint256ToBN(swapInfo1.token_from_amount).toString(),
+        18 // cause its always STRK?
       ).minimum(
-        postFeeAmount.toFixed(claimTokenInfo.decimals)
+        postFeeAmount.toFixed(18) // cause always strk
       ); // ensure we don't swap more than we have
-      if (baseSwapAmount.lt(0.0001)) {
-        baseSwapAmount = new Web3Number(0, claimTokenInfo.decimals);
-      }
-      baseSwapInfo.token_from_amount = uint256.bnToUint256(baseSwapAmount.toWei());
+      swapInfo.token_from_amount = uint256.bnToUint256(swap1Amount.toWei());
+      swapInfo.token_to_min_amount = uint256.bnToUint256(
+        swap1Amount.multipliedBy(0).toWei() // placeholder
+      ); // 0.01% slippage
 
-      const isToken0ClaimToken = claim.token.eq(poolKey.token0);
       logger.verbose(
-        `${EkuboCLVault.name}: harvest => isToken0ClaimToken: ${isToken0ClaimToken}, baseSwapAmount: ${baseSwapAmount}`
+        `${EkuboCLVault.name}: harvest => swap1Amount: ${swap1Amount}`
       );
 
-      const remainingAmount = postFeeAmount.minus(baseSwapAmount).maximum(0);
+      const remainingAmount = postFeeAmount.minus(swap1Amount).maximum(0);
       logger.verbose(
         `${EkuboCLVault.name}: harvest => remainingAmount: ${remainingAmount}`
       );
-
-      // obv, same to same
-      let dummySwapInfo = AvnuWrapper.buildZeroSwap(claim.token, this.address.address, claim.token);
-      dummySwapInfo.token_from_amount = uint256.bnToUint256(remainingAmount.toWei());
-
+      const swapInfo2 = {
+        ...swapInfo,
+        token_from_amount: uint256.bnToUint256(remainingAmount.toWei()),
+      };
+      swapInfo2.token_to_address = token1Info.address.address;
       logger.verbose(
-        `${EkuboCLVault.name}: harvest => dummySwapInfo: ${JSON.stringify(
-          dummySwapInfo
+        `${EkuboCLVault.name}: harvest => swapInfo: ${JSON.stringify(
+          swapInfo
         )}`
       );
       logger.verbose(
-        `${EkuboCLVault.name}: harvest => baseSwapInfo: ${JSON.stringify(
-          baseSwapInfo
+        `${EkuboCLVault.name}: harvest => swapInfo2: ${JSON.stringify(
+          swapInfo2
         )}`
       );
       const calldata = [
@@ -1808,41 +1742,18 @@ export class EkuboCLVault extends BaseStrategy<
           claimee: claim.claim.claimee.address,
         },
         claim.proof.map((p) => num.getDecimalString(p)),
-        isToken0ClaimToken ? dummySwapInfo : baseSwapInfo, // is token0 claim token, its just dummy swap
-        isToken0ClaimToken ? baseSwapInfo : dummySwapInfo,
+        swapInfo,
+        swapInfo2,
       ];
+      logger.verbose(
+        `${EkuboCLVault.name}: harvest => calldata: ${JSON.stringify(
+          calldata
+        )}`
+      );
       return [this.contract.populate("harvest", calldata)];
     };
-
-    // if token0 == claim token, then the base swapInfo is from claim token to token1
-    // if token1 == claim token, then the base swapInfo is from claim token to token0
-    const isToken0ClaimToken = claim.token.eq(poolKey.token0);
-    let baseSwapInfo = AvnuWrapper.buildZeroSwap(claim.token, this.address.address, isToken0ClaimToken ? token1Info.address : token0Info.address);
-    baseSwapInfo.token_from_amount = uint256.bnToUint256(postFeeAmount.toWei()); // we try to swap all to start with
-   
-    // if token0 != claim token, then we swap from claim token to token0
-    if (postFeeAmount.greaterThan(0) && !isToken0ClaimToken) {
-      const avnuWrapper = new AvnuWrapper();
-      const quote = await avnuWrapper.getQuotes(
-        claim.token.address,
-        token0Info.address.address,
-        postFeeAmount.toWei(),
-        this.address.address
-      );
-      baseSwapInfo = await avnuWrapper.getSwapInfo(quote, this.address.address, 0, this.address.address);
-    } else if (postFeeAmount.greaterThan(0) && isToken0ClaimToken) {
-      // if token0 == claim token, then we swap from claim token to token1
-      const avnuWrapper = new AvnuWrapper();
-      const quote = await avnuWrapper.getQuotes(
-        claim.token.address,
-        token1Info.address.address,
-        postFeeAmount.toWei(),
-        this.address.address
-      );
-      baseSwapInfo = await avnuWrapper.getSwapInfo(quote, this.address.address, 0, this.address.address);
-    }
     const _callsFinal = await this.rebalanceIter(
-      baseSwapInfo,
+      swapInfo,
       acc,
       harvestEstimateCall,
       claim.token.eq(poolKey.token0),
@@ -1912,47 +1823,39 @@ export class EkuboCLVault extends BaseStrategy<
   }) {
     const { postFeeAmount, claim, token0Info, token1Info, acc } = params;
     let harvestCall: Call | null = null;
-    logger.verbose(`${EkuboCLVault.name}: harvestMismatchEstimateCallFn => postFeeAmount: ${postFeeAmount.toString()}`);
 
-    let attempt = 0;
-    let MAX_ATTEMPTS = 50;
     const binarySearchCallbackFn = async (mid: bigint) => {
-      attempt++;
-      logger.verbose(`${EkuboCLVault.name}: harvestMismatchEstimateCallFn => mid: ${mid}, attempt: ${attempt}/${MAX_ATTEMPTS}`);
       const rewardPart2 = BigInt(postFeeAmount.toWei()) - mid;
       const avnuWrapper = new AvnuWrapper();
       const beneficiary = this.address.address;
 
       // get quote for 1st part
-      const quote1Prom = avnuWrapper.getQuotes(
+      const quote1 = await avnuWrapper.getQuotes(
         claim.token.address,
         token0Info.address.address,
         mid.toString(),
         beneficiary
       );
-      const quote2Prom = avnuWrapper.getQuotes(
-        claim.token.address,
-        token1Info.address.address,
-        rewardPart2.toString(),
-        beneficiary
-      );
-      const [quote1, quote2] = await Promise.all([quote1Prom, quote2Prom]);
-      
       // default min amount is ok
       const swapInfo1 = await avnuWrapper.getSwapInfo(
         quote1,
         beneficiary,
-        0, // fee bps
+        0,
         beneficiary
       );
 
       // get quote for 2nd part
-
+      const quote2 = await avnuWrapper.getQuotes(
+        claim.token.address,
+        token1Info.address.address,
+        rewardPart2.toString(),
+        beneficiary
+      );
       // default min amount is ok
       const swapInfo2 = await avnuWrapper.getSwapInfo(
         quote2,
         beneficiary,
-        0, // fee bps
+        0,
         beneficiary
       );
 
@@ -1971,19 +1874,15 @@ export class EkuboCLVault extends BaseStrategy<
         ];
         harvestCall = this.contract.populate("harvest", calldata)
         const gas = await acc.estimateInvokeFee(harvestCall);
-        logger.verbose(`${EkuboCLVault.name}: harvestMismatchEstimateCallFn => gas: ${gas.overall_fee.toString()}, attempt: ${attempt}/${MAX_ATTEMPTS}`);
         return 'found';
       } catch (err: any) {
         if (err.message.includes('invalid token0 amount')) {
-          logger.verbose(`${EkuboCLVault.name}: harvestMismatchEstimateCallFn => invalid token0 amount, attempt: ${attempt}/${MAX_ATTEMPTS}`);
           // too much token0 amount left, may be swap less to token0
           return 'go_low';
         } else if (err.message.includes('invalid token1 amount')) {
-          logger.verbose(`${EkuboCLVault.name}: harvestMismatchEstimateCallFn => invalid token1 amount, attempt: ${attempt}/${MAX_ATTEMPTS}`);
           // too much token1 balance left, may be swap more to token0
           return 'go_high';
         }
-        logger.verbose(`${EkuboCLVault.name}: harvestMismatchEstimateCallFn => error: ${err.message}, attempt: ${attempt}/${MAX_ATTEMPTS}`);
         return 'retry';
       }
     }
@@ -2016,7 +1915,7 @@ export class EkuboCLVault extends BaseStrategy<
       id: "base",
       title: "Your Deposit",
       subItems: [
-        { key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` },
+        { key: `Net yield`, value: `${(netYield.net * 100).toFixed(2)}%` },
         {
           key: `Performance Fee`,
           value: `${(this.metadata.additionalInfo.feeBps / 100).toFixed(2)}%`,
@@ -2303,7 +2202,7 @@ const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
 
 const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
   ...xSTRKSTRK,
-  name: "Ekubo ETH/USDC.e",
+  name: "Ekubo ETH/USDC",
   description: <></>,
   address: ContractAddr.from(
     "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947"
@@ -2312,7 +2211,7 @@ const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
   // must be same order as poolKey token0 and token1
   depositTokens: [
     Global.getDefaultTokens().find((t) => t.symbol === "ETH")!,
-    Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
+    Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
   ],
   apyMethodology:
   "Annualized fee APY, calculated as fees earned in the last 7d divided by TVL",
@@ -2326,7 +2225,7 @@ const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
       minWaitHours: 6,
       direction: "any"
     },
-    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!,
+    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
   },
   faqs: [
     ...faqs,
@@ -2350,7 +2249,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
   ETHUSDCRe7Strategy,
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC.e/USDT",
+    name: "Ekubo USDC/USDT",
     description: <></>,
     address: ContractAddr.from(
       "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2"
@@ -2358,7 +2257,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     launchBlock: 1506139,
     // must be same order as poolKey token0 and token1
     depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!,
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
       Global.getDefaultTokens().find((t) => t.symbol === "USDT")!
     ],
     risk: {
@@ -2371,7 +2270,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC.e",
+    name: "Ekubo STRK/USDC",
     description: <></>,
     address: ContractAddr.from(
       "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30"
@@ -2380,7 +2279,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     // must be same order as poolKey token0 and token1
     depositTokens: [
       Global.getDefaultTokens().find((t) => t.symbol === "STRK")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
     ],
     risk: highRisk,
   },
@@ -2401,7 +2300,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC.e",
+    name: "Ekubo WBTC/USDC",
     description: <></>,
     address: ContractAddr.from(
       "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1"
@@ -2410,13 +2309,13 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     // must be same order as poolKey token0 and token1
     depositTokens: [
       Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
     ],
     risk: mediumRisk,
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo tBTC/USDC.e",
+    name: "Ekubo tBTC/USDC",
     description: <></>,
     address: ContractAddr.from(
       "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456"
@@ -2425,7 +2324,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     // must be same order as poolKey token0 and token1
     depositTokens: [
       Global.getDefaultTokens().find((t) => t.symbol === "tBTC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
     ],
     risk: mediumRisk,
   },
@@ -2458,88 +2357,6 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
       Global.getDefaultTokens().find((t) => t.symbol === "STRK")!
     ],
     risk: highRisk,
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC/USDT",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x5203a08b471e46bf33990ac83aff577bbe5a5d789e61de2c6531e3c4773d1c9"
-    ),
-    launchBlock: 3998018,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "USDT")!
-    ],
-    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),
-    },
-    additionalInfo: {
-      ...ETHUSDCRe7Strategy.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-    }
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo ETH/USDC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x4d00c7423b3c0fae3640f6099ac97acbfd8708f099e09bfe3a7a6a680399228"
-    ),
-    launchBlock: 3998025,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "ETH")!,
-    ],
-    risk: highRisk,
-    additionalInfo: {
-      ...ETHUSDCRe7Strategy.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-    }
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x4de22bd0a8eb4d0a18736e66dd36d20ba50bc106346bbfac3dbeaac1ab37ce1"
-    ),
-    launchBlock: 3998030,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "STRK")!,
-    ],
-    risk: highRisk,
-    additionalInfo: {
-      ...ETHUSDCRe7Strategy.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-    }
-  },
-  {
-    ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC",
-    description: <></>,
-    address: ContractAddr.from(
-      "0x76101c3b80af1103c9c6d541ca627f61b5ae7ae79d7fce96ccdf7bdb648450d"
-    ),
-    launchBlock: 3998034,
-    // must be same order as poolKey token0 and token1
-    depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-      Global.getDefaultTokens().find((t) => t.symbol === "WBTC")!,
-    ],
-    risk: mediumRisk,
-    additionalInfo: {
-      ...ETHUSDCRe7Strategy.additionalInfo,
-      quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
-    }
   }
 ];