@strkfarm/sdk 1.1.61 → 1.1.63

package/src/modules/pricer.ts

@@ -26,6 +26,7 @@ export class Pricer extends PricerBase {
     /**
      * TOKENA and TOKENB are the two token names to get price of TokenA in terms of TokenB
      */
+    // ! switch to USDC (new) later
     protected PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
     protected EKUBO_API = 'https://quoter-mainnet-api.ekubo.org/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8'; // e.g. ETH/USDC
 

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

@@ -37,7 +37,7 @@ 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";
@@ -504,7 +504,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";
     if (!isUSDCQouteToken) {
       // good for LSTs and stables
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
@@ -1032,6 +1033,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),
@@ -1198,6 +1205,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;
@@ -1432,6 +1440,7 @@ export class EkuboCLVault extends BaseStrategy<
     }
 
     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}`
     );
@@ -1451,7 +1460,7 @@ export class EkuboCLVault extends BaseStrategy<
       );
 
       const newSwapInfo = { ...swapInfo };
-      const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18); // 18 is ok, as its toWei eventually anyways
+      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") ||
@@ -1537,6 +1546,11 @@ export class EkuboCLVault extends BaseStrategy<
         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,
@@ -2289,7 +2303,7 @@ const lstStrategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
 
 const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
   ...xSTRKSTRK,
-  name: "Ekubo ETH/USDC",
+  name: "Ekubo ETH/USDC.e",
   description: <></>,
   address: ContractAddr.from(
     "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947"
@@ -2298,7 +2312,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")!
+    Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
   ],
   apyMethodology:
   "Annualized fee APY, calculated as fees earned in the last 7d divided by TVL",
@@ -2312,7 +2326,7 @@ const ETHUSDCRe7Strategy: IStrategyMetadata<CLVaultStrategySettings> = {
       minWaitHours: 6,
       direction: "any"
     },
-    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
+    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!,
   },
   faqs: [
     ...faqs,
@@ -2336,7 +2350,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
   ETHUSDCRe7Strategy,
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC/USDT",
+    name: "Ekubo USDC.e/USDT",
     description: <></>,
     address: ContractAddr.from(
       "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2"
@@ -2344,7 +2358,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
     launchBlock: 1506139,
     // must be same order as poolKey token0 and token1
     depositTokens: [
-      Global.getDefaultTokens().find((t) => t.symbol === "USDC")!,
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!,
       Global.getDefaultTokens().find((t) => t.symbol === "USDT")!
     ],
     risk: {
@@ -2357,7 +2371,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC",
+    name: "Ekubo STRK/USDC.e",
     description: <></>,
     address: ContractAddr.from(
       "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30"
@@ -2366,7 +2380,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")!
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
     ],
     risk: highRisk,
   },
@@ -2387,7 +2401,7 @@ const RE7Strategies: IStrategyMetadata<CLVaultStrategySettings>[] = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC",
+    name: "Ekubo WBTC/USDC.e",
     description: <></>,
     address: ContractAddr.from(
       "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1"
@@ -2396,13 +2410,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")!
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
     ],
     risk: mediumRisk,
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo tBTC/USDC",
+    name: "Ekubo tBTC/USDC.e",
     description: <></>,
     address: ContractAddr.from(
       "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456"
@@ -2411,7 +2425,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")!
+      Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
     ],
     risk: mediumRisk,
   },

package/src/strategies/universal-strategy.tsx

@@ -1143,13 +1143,13 @@ const AUDIT_URL = 'https://docs.troves.fi/p/security#starknet-vault-kit'
 export const UniversalStrategies: IStrategyMetadata<UniversalStrategySettings>[] =
   [
     {
-      name: "USDC Evergreen",
-      description: getDescription('USDC', ['vesu', 'extended']),
+      name: "USDC.e Evergreen",
+      description: getDescription('USDC.e', ['vesu', 'extended']),
       address: ContractAddr.from('0x7e6498cf6a1bfc7e6fc89f1831865e2dacb9756def4ec4b031a9138788a3b5e'),
       launchBlock: 0,
       type: 'ERC4626',
-      depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'USDC')!],
-      additionalInfo: getLooperSettings('USDC', 'ETH', usdcVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
+      depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'USDC.e')!],
+      additionalInfo: getLooperSettings('USDC.e', 'ETH', usdcVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
       risk: {
         riskFactor: _riskFactor,
         netRisk:

package/src/strategies/vesu-rebalance.tsx

@@ -1014,8 +1014,8 @@ export const VesuRebalanceStrategies: IStrategyMetadata<VesuRebalanceSettings>[]
       investmentSteps: []
     },
     {
-      name: "Vesu Fusion USDC",
-      description: _description.replace("{{TOKEN}}", "USDC"),
+      name: "Vesu Fusion USDC.e",
+      description: _description.replace("{{TOKEN}}", "USDC.e"),
       address: ContractAddr.from(
         "0xa858c97e9454f407d1bd7c57472fc8d8d8449a777c822b41d18e387816f29c"
       ),
@@ -1023,7 +1023,7 @@ export const VesuRebalanceStrategies: IStrategyMetadata<VesuRebalanceSettings>[]
       type: "ERC4626",
       auditUrl: AUDIT_URL,
       depositTokens: [
-        Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
+        Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
       ],
       protocols: [_protocol],
       maxTVL: Web3Number.fromWei("0", 6),