@strkfarm/sdk 1.1.61 → 1.1.63

package/dist/index.browser.mjs

@@ -171,11 +171,20 @@ var defaultTokens = [{
   coingeckId: void 0,
   priceCheckAmount: 0.1,
   displayDecimals: 6
+}, {
+  name: "USDC.e",
+  symbol: "USDC.e",
+  logo: "https://assets.troves.fi/integrations/tokens/usdc.svg",
+  address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
+  decimals: 6,
+  coingeckId: void 0,
+  displayDecimals: 2,
+  priceCheckAmount: 1e3
 }, {
   name: "USDC",
   symbol: "USDC",
   logo: "https://assets.troves.fi/integrations/tokens/usdc.svg",
-  address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
+  address: ContractAddr.from("0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb"),
   decimals: 6,
   coingeckId: void 0,
   displayDecimals: 2,
@@ -393,6 +402,7 @@ var Pricer = class extends PricerBase {
     /**
      * TOKENA and TOKENB are the two token names to get price of TokenA in terms of TokenB
      */
+    // ! switch to USDC (new) later
     this.PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
     this.EKUBO_API = "https://quoter-mainnet-api.ekubo.org/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8";
     this.refreshInterval = refreshInterval;
@@ -10438,8 +10448,8 @@ var VesuRebalanceStrategies = [
     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"
     ),
@@ -10447,7 +10457,7 @@ var VesuRebalanceStrategies = [
     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),
@@ -15839,7 +15849,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<number>} The weighted average APY across all pools
    */
   async netAPY(blockIdentifier = "latest", sinceBlocks = 6e5, timeperiod = "24h") {
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e";
     if (!isUSDCQouteToken) {
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
     } else {
@@ -16255,6 +16265,12 @@ var EkuboCLVault = 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),
@@ -16362,6 +16378,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
   // Helper to determine which token to sell, which to buy, and the amounts to use
   getSwapParams(expectedAmounts, poolKey, token0Bal, token1Bal) {
     const tokenToSell = expectedAmounts.amount0.lessThan(token0Bal) ? poolKey.token0 : poolKey.token1;
+    logger.verbose(`getSwapParams => tokenToSell: ${tokenToSell.address}, expectedAmounts: ${expectedAmounts.amount0.toString()}, bal0: ${token0Bal.toString()}`);
     const tokenToBuy = tokenToSell == poolKey.token0 ? poolKey.token1 : poolKey.token0;
     const amountToSell = tokenToSell == poolKey.token0 ? token0Bal.minus(expectedAmounts.amount0) : token1Bal.minus(expectedAmounts.amount1);
     if (amountToSell.eq(0)) {
@@ -16516,6 +16533,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       throw new Error(`Rebalance failed after ${MAX_SAME_ERROR_COUNT} same errors`);
     }
     const fromAmount = uint2564.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}`
     );
@@ -16532,7 +16550,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
         `Rebalance attempt ${retry + 1} failed, adjusting swap amount...`
       );
       const newSwapInfo = { ...swapInfo };
-      const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+      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")) {
         if (!isSellTokenToken0) {
@@ -17214,7 +17232,7 @@ var lstStrategies = [
 ];
 var ETHUSDCRe7Strategy = {
   ...xSTRKSTRK,
-  name: "Ekubo ETH/USDC",
+  name: "Ekubo ETH/USDC.e",
   description: /* @__PURE__ */ jsx3(Fragment2, {}),
   address: ContractAddr.from(
     "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947"
@@ -17223,7 +17241,7 @@ var ETHUSDCRe7Strategy = {
   // 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",
   additionalInfo: {
@@ -17235,7 +17253,7 @@ var ETHUSDCRe7Strategy = {
       minWaitHours: 6,
       direction: "any"
     },
-    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")
+    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")
   },
   faqs: [
     ...faqs2,
@@ -17260,7 +17278,7 @@ var RE7Strategies = [
   ETHUSDCRe7Strategy,
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC/USDT",
+    name: "Ekubo USDC.e/USDT",
     description: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2"
@@ -17268,7 +17286,7 @@ var RE7Strategies = [
     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: {
@@ -17279,7 +17297,7 @@ var RE7Strategies = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC",
+    name: "Ekubo STRK/USDC.e",
     description: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30"
@@ -17288,7 +17306,7 @@ var RE7Strategies = [
     // 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
   },
@@ -17309,7 +17327,7 @@ var RE7Strategies = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC",
+    name: "Ekubo WBTC/USDC.e",
     description: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1"
@@ -17318,13 +17336,13 @@ var RE7Strategies = [
     // 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: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456"
@@ -17333,7 +17351,7 @@ var RE7Strategies = [
     // 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
   },
@@ -30639,13 +30657,13 @@ var investmentSteps = [
 var AUDIT_URL3 = "https://docs.troves.fi/p/security#starknet-vault-kit";
 var UniversalStrategies = [
   {
-    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: _riskFactor3,
       netRisk: _riskFactor3.reduce((acc, curr) => acc + curr.value * curr.weight, 0) / _riskFactor3.reduce((acc, curr) => acc + curr.weight, 0),

package/dist/index.js

@@ -9,11 +9,11 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
+var __copyProps = (to, from2, except, desc) => {
+  if (from2 && typeof from2 === "object" || typeof from2 === "function") {
+    for (let key of __getOwnPropNames(from2))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+        __defProp(to, key, { get: () => from2[key], enumerable: !(desc = __getOwnPropDesc(from2, key)) || desc.enumerable });
   }
   return to;
 };
@@ -318,11 +318,20 @@ var defaultTokens = [{
   coingeckId: void 0,
   priceCheckAmount: 0.1,
   displayDecimals: 6
+}, {
+  name: "USDC.e",
+  symbol: "USDC.e",
+  logo: "https://assets.troves.fi/integrations/tokens/usdc.svg",
+  address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
+  decimals: 6,
+  coingeckId: void 0,
+  displayDecimals: 2,
+  priceCheckAmount: 1e3
 }, {
   name: "USDC",
   symbol: "USDC",
   logo: "https://assets.troves.fi/integrations/tokens/usdc.svg",
-  address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
+  address: ContractAddr.from("0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb"),
   decimals: 6,
   coingeckId: void 0,
   displayDecimals: 2,
@@ -540,6 +549,7 @@ var Pricer = class extends PricerBase {
     /**
      * TOKENA and TOKENB are the two token names to get price of TokenA in terms of TokenB
      */
+    // ! switch to USDC (new) later
     this.PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
     this.EKUBO_API = "https://quoter-mainnet-api.ekubo.org/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8";
     this.refreshInterval = refreshInterval;
@@ -10442,8 +10452,8 @@ var VesuRebalanceStrategies = [
     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"
     ),
@@ -10451,7 +10461,7 @@ var VesuRebalanceStrategies = [
     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),
@@ -15839,7 +15849,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<number>} The weighted average APY across all pools
    */
   async netAPY(blockIdentifier = "latest", sinceBlocks = 6e5, timeperiod = "24h") {
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e";
     if (!isUSDCQouteToken) {
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
     } else {
@@ -16255,6 +16265,12 @@ var EkuboCLVault = 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),
@@ -16362,6 +16378,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
   // Helper to determine which token to sell, which to buy, and the amounts to use
   getSwapParams(expectedAmounts, poolKey, token0Bal, token1Bal) {
     const tokenToSell = expectedAmounts.amount0.lessThan(token0Bal) ? poolKey.token0 : poolKey.token1;
+    logger.verbose(`getSwapParams => tokenToSell: ${tokenToSell.address}, expectedAmounts: ${expectedAmounts.amount0.toString()}, bal0: ${token0Bal.toString()}`);
     const tokenToBuy = tokenToSell == poolKey.token0 ? poolKey.token1 : poolKey.token0;
     const amountToSell = tokenToSell == poolKey.token0 ? token0Bal.minus(expectedAmounts.amount0) : token1Bal.minus(expectedAmounts.amount1);
     if (amountToSell.eq(0)) {
@@ -16516,6 +16533,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       throw new Error(`Rebalance failed after ${MAX_SAME_ERROR_COUNT} same errors`);
     }
     const fromAmount = import_starknet11.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}`
     );
@@ -16532,7 +16550,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
         `Rebalance attempt ${retry + 1} failed, adjusting swap amount...`
       );
       const newSwapInfo = { ...swapInfo };
-      const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+      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")) {
         if (!isSellTokenToken0) {
@@ -17214,7 +17232,7 @@ var lstStrategies = [
 ];
 var ETHUSDCRe7Strategy = {
   ...xSTRKSTRK,
-  name: "Ekubo ETH/USDC",
+  name: "Ekubo ETH/USDC.e",
   description: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {}),
   address: ContractAddr.from(
     "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947"
@@ -17223,7 +17241,7 @@ var ETHUSDCRe7Strategy = {
   // 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",
   additionalInfo: {
@@ -17235,7 +17253,7 @@ var ETHUSDCRe7Strategy = {
       minWaitHours: 6,
       direction: "any"
     },
-    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")
+    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")
   },
   faqs: [
     ...faqs2,
@@ -17260,7 +17278,7 @@ var RE7Strategies = [
   ETHUSDCRe7Strategy,
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC/USDT",
+    name: "Ekubo USDC.e/USDT",
     description: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {}),
     address: ContractAddr.from(
       "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2"
@@ -17268,7 +17286,7 @@ var RE7Strategies = [
     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: {
@@ -17279,7 +17297,7 @@ var RE7Strategies = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC",
+    name: "Ekubo STRK/USDC.e",
     description: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {}),
     address: ContractAddr.from(
       "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30"
@@ -17288,7 +17306,7 @@ var RE7Strategies = [
     // 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
   },
@@ -17309,7 +17327,7 @@ var RE7Strategies = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC",
+    name: "Ekubo WBTC/USDC.e",
     description: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {}),
     address: ContractAddr.from(
       "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1"
@@ -17318,13 +17336,13 @@ var RE7Strategies = [
     // 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: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, {}),
     address: ContractAddr.from(
       "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456"
@@ -17333,7 +17351,7 @@ var RE7Strategies = [
     // 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
   },
@@ -30639,13 +30657,13 @@ var investmentSteps = [
 var AUDIT_URL3 = "https://docs.troves.fi/p/security#starknet-vault-kit";
 var UniversalStrategies = [
   {
-    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: _riskFactor3,
       netRisk: _riskFactor3.reduce((acc, curr) => acc + curr.value * curr.weight, 0) / _riskFactor3.reduce((acc, curr) => acc + curr.weight, 0),

package/dist/index.mjs

@@ -212,11 +212,20 @@ var defaultTokens = [{
   coingeckId: void 0,
   priceCheckAmount: 0.1,
   displayDecimals: 6
+}, {
+  name: "USDC.e",
+  symbol: "USDC.e",
+  logo: "https://assets.troves.fi/integrations/tokens/usdc.svg",
+  address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
+  decimals: 6,
+  coingeckId: void 0,
+  displayDecimals: 2,
+  priceCheckAmount: 1e3
 }, {
   name: "USDC",
   symbol: "USDC",
   logo: "https://assets.troves.fi/integrations/tokens/usdc.svg",
-  address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
+  address: ContractAddr.from("0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb"),
   decimals: 6,
   coingeckId: void 0,
   displayDecimals: 2,
@@ -434,6 +443,7 @@ var Pricer = class extends PricerBase {
     /**
      * TOKENA and TOKENB are the two token names to get price of TokenA in terms of TokenB
      */
+    // ! switch to USDC (new) later
     this.PRICE_API = `https://api.coinbase.com/v2/prices/{{PRICER_KEY}}/buy`;
     this.EKUBO_API = "https://quoter-mainnet-api.ekubo.org/{{AMOUNT}}/{{TOKEN_ADDRESS}}/0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8";
     this.refreshInterval = refreshInterval;
@@ -10336,8 +10346,8 @@ var VesuRebalanceStrategies = [
     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"
     ),
@@ -10345,7 +10355,7 @@ var VesuRebalanceStrategies = [
     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),
@@ -15737,7 +15747,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns {Promise<number>} The weighted average APY across all pools
    */
   async netAPY(blockIdentifier = "latest", sinceBlocks = 6e5, timeperiod = "24h") {
-    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC";
+    const isUSDCQouteToken = this.metadata.additionalInfo.quoteAsset.symbol === "USDC.e";
     if (!isUSDCQouteToken) {
       return this.netSharesBasedTrueAPY(blockIdentifier, sinceBlocks);
     } else {
@@ -16153,6 +16163,12 @@ var EkuboCLVault = 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),
@@ -16260,6 +16276,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
   // Helper to determine which token to sell, which to buy, and the amounts to use
   getSwapParams(expectedAmounts, poolKey, token0Bal, token1Bal) {
     const tokenToSell = expectedAmounts.amount0.lessThan(token0Bal) ? poolKey.token0 : poolKey.token1;
+    logger.verbose(`getSwapParams => tokenToSell: ${tokenToSell.address}, expectedAmounts: ${expectedAmounts.amount0.toString()}, bal0: ${token0Bal.toString()}`);
     const tokenToBuy = tokenToSell == poolKey.token0 ? poolKey.token1 : poolKey.token0;
     const amountToSell = tokenToSell == poolKey.token0 ? token0Bal.minus(expectedAmounts.amount0) : token1Bal.minus(expectedAmounts.amount1);
     if (amountToSell.eq(0)) {
@@ -16414,6 +16431,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
       throw new Error(`Rebalance failed after ${MAX_SAME_ERROR_COUNT} same errors`);
     }
     const fromAmount = uint2564.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}`
     );
@@ -16430,7 +16448,7 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
         `Rebalance attempt ${retry + 1} failed, adjusting swap amount...`
       );
       const newSwapInfo = { ...swapInfo };
-      const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+      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")) {
         if (!isSellTokenToken0) {
@@ -17112,7 +17130,7 @@ var lstStrategies = [
 ];
 var ETHUSDCRe7Strategy = {
   ...xSTRKSTRK,
-  name: "Ekubo ETH/USDC",
+  name: "Ekubo ETH/USDC.e",
   description: /* @__PURE__ */ jsx3(Fragment2, {}),
   address: ContractAddr.from(
     "0x160d8fa4569ef6a12e6bf47cb943d7b5ebba8a41a69a14c1d943050ba5ff947"
@@ -17121,7 +17139,7 @@ var ETHUSDCRe7Strategy = {
   // 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",
   additionalInfo: {
@@ -17133,7 +17151,7 @@ var ETHUSDCRe7Strategy = {
       minWaitHours: 6,
       direction: "any"
     },
-    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC")
+    quoteAsset: Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")
   },
   faqs: [
     ...faqs2,
@@ -17158,7 +17176,7 @@ var RE7Strategies = [
   ETHUSDCRe7Strategy,
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo USDC/USDT",
+    name: "Ekubo USDC.e/USDT",
     description: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x3a4f8debaf12af97bb911099bc011d63d6c208d4c5ba8e15d7f437785b0aaa2"
@@ -17166,7 +17184,7 @@ var RE7Strategies = [
     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: {
@@ -17177,7 +17195,7 @@ var RE7Strategies = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo STRK/USDC",
+    name: "Ekubo STRK/USDC.e",
     description: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x351b36d0d9d8b40010658825adeeddb1397436cd41acd0ff6c6e23aaa8b5b30"
@@ -17186,7 +17204,7 @@ var RE7Strategies = [
     // 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
   },
@@ -17207,7 +17225,7 @@ var RE7Strategies = [
   },
   {
     ...ETHUSDCRe7Strategy,
-    name: "Ekubo WBTC/USDC",
+    name: "Ekubo WBTC/USDC.e",
     description: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x2bcaef2eb7706875a5fdc6853dd961a0590f850bc3a031c59887189b5e84ba1"
@@ -17216,13 +17234,13 @@ var RE7Strategies = [
     // 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: /* @__PURE__ */ jsx3(Fragment2, {}),
     address: ContractAddr.from(
       "0x4aad891a2d4432fba06b6558631bb13f6bbd7f6f33ab8c3111e344889ea4456"
@@ -17231,7 +17249,7 @@ var RE7Strategies = [
     // 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
   },
@@ -30537,13 +30555,13 @@ var investmentSteps = [
 var AUDIT_URL3 = "https://docs.troves.fi/p/security#starknet-vault-kit";
 var UniversalStrategies = [
   {
-    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: _riskFactor3,
       netRisk: _riskFactor3.reduce((acc, curr) => acc + curr.value * curr.weight, 0) / _riskFactor3.reduce((acc, curr) => acc + curr.weight, 0),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
   "typings": "dist/index.d.ts",
   "types": "dist/index.d.ts",

package/src/global.ts

@@ -41,11 +41,20 @@ const defaultTokens: TokenInfo[] = [{
     coingeckId: undefined,
     priceCheckAmount: 0.1, 
     displayDecimals: 6,
+}, {
+    name: 'USDC.e',
+    symbol: 'USDC.e',
+    logo: 'https://assets.troves.fi/integrations/tokens/usdc.svg',
+    address: ContractAddr.from('0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8'),
+    decimals: 6,
+    coingeckId: undefined,
+    displayDecimals: 2,
+    priceCheckAmount: 1000,
 }, {
     name: 'USDC',
     symbol: 'USDC',
     logo: 'https://assets.troves.fi/integrations/tokens/usdc.svg',
-    address: ContractAddr.from('0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8'),
+    address: ContractAddr.from('0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb'),
     decimals: 6,
     coingeckId: undefined,
     displayDecimals: 2,