@strkfarm/sdk 1.0.32 → 1.0.34

package/dist/index.browser.mjs

@@ -113,7 +113,7 @@ var FatalError = class extends Error {
 var defaultTokens = [{
   name: "Starknet",
   symbol: "STRK",
-  logo: "https://assets.coingecko.com/coins/images/26433/small/starknet.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/strk.svg",
   address: ContractAddr.from("0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"),
   decimals: 18,
   coingeckId: "starknet",
@@ -121,7 +121,7 @@ var defaultTokens = [{
 }, {
   name: "xSTRK",
   symbol: "xSTRK",
-  logo: "https://dashboard.endur.fi/endur-fi.svg",
+  logo: "https://assets.strkfarm.com/integrations/tokens/xstrk.svg",
   address: ContractAddr.from("0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a"),
   decimals: 18,
   coingeckId: void 0,
@@ -129,7 +129,7 @@ var defaultTokens = [{
 }, {
   name: "ETH",
   symbol: "ETH",
-  logo: "https://opbnb.bscscan.com/token/images/ether.svg",
+  logo: "https://assets.strkfarm.com/integrations/tokens/eth.svg",
   address: ContractAddr.from("0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"),
   decimals: 18,
   coingeckId: void 0,
@@ -137,7 +137,7 @@ var defaultTokens = [{
 }, {
   name: "USDC",
   symbol: "USDC",
-  logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/usdc.svg",
   address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
   decimals: 6,
   coingeckId: void 0,
@@ -145,7 +145,7 @@ var defaultTokens = [{
 }, {
   name: "USDT",
   symbol: "USDT",
-  logo: "https://assets.coingecko.com/coins/images/325/small/Tether.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/usdc.svg",
   address: ContractAddr.from("0x68f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8"),
   decimals: 6,
   coingeckId: void 0,
@@ -153,7 +153,7 @@ var defaultTokens = [{
 }, {
   name: "WBTC",
   symbol: "WBTC",
-  logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/wbtc.svg",
   address: ContractAddr.from("0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac"),
   decimals: 8,
   coingeckId: void 0,
@@ -177,7 +177,7 @@ var Global = class _Global {
   }
   static async getTokens() {
     if (tokens.length) return tokens;
-    const data = await axios.get("https://starknet.api.avnu.fi/v1/starknet/tokens");
+    const data = await axios.get("https://assets.strkfarm.com/integrations/tokens.json");
     const tokensData = data.data.content;
     tokensData.forEach((token) => {
       if (!token.tags.includes("AVNU") || !token.tags.includes("Verified")) {
@@ -18630,11 +18630,10 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns Array of contract calls needed for rebalancing
    * @throws Error if max retries reached without successful rebalance
    */
-  async rebalanceIter(swapInfo, acc, estimateCall, retry = 0, adjustmentFactor = 1, isToken0Deficit = true) {
-    const MAX_RETRIES = 20;
-    const MIN_ADJUSTMENT = 1e-3;
+  async rebalanceIter(swapInfo, acc, estimateCall, isSellTokenToken0 = true, retry = 0, lowerLimit = 0n, upperLimit = 0n) {
+    const MAX_RETRIES = 40;
     logger.verbose(
-      `Rebalancing ${this.metadata.name}: retry=${retry}, adjustment=${adjustmentFactor}%, token0Deficit=${isToken0Deficit}`
+      `Rebalancing ${this.metadata.name}: retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}`
     );
     const fromAmount = uint2564.uint256ToBN(swapInfo.token_from_amount);
     logger.verbose(
@@ -18649,38 +18648,69 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
         logger.error(`Rebalance failed after ${MAX_RETRIES} retries`);
         throw err;
       }
-      if (adjustmentFactor < MIN_ADJUSTMENT) {
-        logger.error("Adjustment factor too small, likely oscillating");
-        throw new Error("Failed to converge on valid swap amount");
-      }
       logger.error(`Rebalance attempt ${retry + 1} failed, adjusting swap amount...`);
       const newSwapInfo = { ...swapInfo };
       const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+      logger.verbose(`Current amount: ${currentAmount.toString()}`);
       if (err.message.includes("invalid token0 balance") || err.message.includes("invalid token0 amount")) {
-        logger.verbose("Reducing swap amount - excess token0");
-        newSwapInfo.token_from_amount = uint2564.bnToUint256(
-          currentAmount.multipliedBy((100 - adjustmentFactor) / 100).toWei()
-        );
-        adjustmentFactor = isToken0Deficit ? adjustmentFactor * 2 : adjustmentFactor / 2;
-        isToken0Deficit = true;
-      } else if (err.message.includes("invalid token1 balance") || err.message.includes("invalid token1 amount")) {
-        logger.verbose("Increasing swap amount - excess token1");
-        newSwapInfo.token_from_amount = uint2564.bnToUint256(
-          currentAmount.multipliedBy((100 + adjustmentFactor) / 100).toWei()
-        );
-        adjustmentFactor = isToken0Deficit ? adjustmentFactor / 2 : adjustmentFactor * 2;
-        isToken0Deficit = false;
+        if (!isSellTokenToken0) {
+          logger.verbose("Reducing swap amount - excess token0");
+          let nextAmount = (fromAmount + lowerLimit) / 2n;
+          upperLimit = fromAmount;
+          if (nextAmount <= lowerLimit) {
+            logger.error("Convergence failed: nextAmount <= lowerLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        } else {
+          logger.verbose("Increasing swap amount - deficit token0");
+          let nextAmount = (fromAmount + upperLimit) / 2n;
+          if (upperLimit == 0n) {
+            nextAmount = fromAmount * 2n;
+          }
+          lowerLimit = fromAmount;
+          if (upperLimit != 0n && nextAmount >= upperLimit) {
+            logger.error("Convergence failed: nextAmount >= upperLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        }
+      } else if (err.message.includes("invalid token1 amount") || err.message.includes("invalid token1 balance")) {
+        if (isSellTokenToken0) {
+          logger.verbose("Reducing swap amount - excess token1");
+          let nextAmount = (fromAmount + lowerLimit) / 2n;
+          upperLimit = fromAmount;
+          if (nextAmount <= lowerLimit) {
+            logger.error("Convergence failed: nextAmount <= lowerLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        } else {
+          logger.verbose("Increasing swap amount - deficit token1");
+          let nextAmount = (fromAmount + upperLimit) / 2n;
+          if (upperLimit == 0n) {
+            nextAmount = fromAmount * 2n;
+          }
+          lowerLimit = fromAmount;
+          if (upperLimit != 0n && nextAmount >= upperLimit) {
+            logger.error("Convergence failed: nextAmount >= upperLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        }
       } else {
         logger.error("Unexpected error:", err);
+        throw err;
       }
       newSwapInfo.token_to_min_amount = uint2564.bnToUint256("0");
       return this.rebalanceIter(
         newSwapInfo,
         acc,
         estimateCall,
+        isSellTokenToken0,
         retry + 1,
-        adjustmentFactor,
-        isToken0Deficit
+        lowerLimit,
+        upperLimit
       );
     }
   }

package/dist/index.d.ts

@@ -717,7 +717,7 @@ declare class EkuboCLVault extends BaseStrategy<DualTokenInfo, DualActionAmount>
      * @returns Array of contract calls needed for rebalancing
      * @throws Error if max retries reached without successful rebalance
      */
-    rebalanceIter(swapInfo: SwapInfo, acc: Account, estimateCall: (swapInfo: SwapInfo) => Promise<Call[]>, retry?: number, adjustmentFactor?: number, isToken0Deficit?: boolean): Promise<Call[]>;
+    rebalanceIter(swapInfo: SwapInfo, acc: Account, estimateCall: (swapInfo: SwapInfo) => Promise<Call[]>, isSellTokenToken0?: boolean, retry?: number, lowerLimit?: bigint, upperLimit?: bigint): Promise<Call[]>;
     static tickToi129(tick: number): {
         mag: number;
         sign: number;

package/dist/index.js

@@ -194,7 +194,7 @@ var FatalError = class extends Error {
 var defaultTokens = [{
   name: "Starknet",
   symbol: "STRK",
-  logo: "https://assets.coingecko.com/coins/images/26433/small/starknet.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/strk.svg",
   address: ContractAddr.from("0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"),
   decimals: 18,
   coingeckId: "starknet",
@@ -202,7 +202,7 @@ var defaultTokens = [{
 }, {
   name: "xSTRK",
   symbol: "xSTRK",
-  logo: "https://dashboard.endur.fi/endur-fi.svg",
+  logo: "https://assets.strkfarm.com/integrations/tokens/xstrk.svg",
   address: ContractAddr.from("0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a"),
   decimals: 18,
   coingeckId: void 0,
@@ -210,7 +210,7 @@ var defaultTokens = [{
 }, {
   name: "ETH",
   symbol: "ETH",
-  logo: "https://opbnb.bscscan.com/token/images/ether.svg",
+  logo: "https://assets.strkfarm.com/integrations/tokens/eth.svg",
   address: ContractAddr.from("0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"),
   decimals: 18,
   coingeckId: void 0,
@@ -218,7 +218,7 @@ var defaultTokens = [{
 }, {
   name: "USDC",
   symbol: "USDC",
-  logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/usdc.svg",
   address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
   decimals: 6,
   coingeckId: void 0,
@@ -226,7 +226,7 @@ var defaultTokens = [{
 }, {
   name: "USDT",
   symbol: "USDT",
-  logo: "https://assets.coingecko.com/coins/images/325/small/Tether.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/usdc.svg",
   address: ContractAddr.from("0x68f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8"),
   decimals: 6,
   coingeckId: void 0,
@@ -234,7 +234,7 @@ var defaultTokens = [{
 }, {
   name: "WBTC",
   symbol: "WBTC",
-  logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/wbtc.svg",
   address: ContractAddr.from("0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac"),
   decimals: 8,
   coingeckId: void 0,
@@ -258,7 +258,7 @@ var Global = class _Global {
   }
   static async getTokens() {
     if (tokens.length) return tokens;
-    const data = await import_axios.default.get("https://starknet.api.avnu.fi/v1/starknet/tokens");
+    const data = await import_axios.default.get("https://assets.strkfarm.com/integrations/tokens.json");
     const tokensData = data.data.content;
     tokensData.forEach((token) => {
       if (!token.tags.includes("AVNU") || !token.tags.includes("Verified")) {
@@ -18719,11 +18719,10 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns Array of contract calls needed for rebalancing
    * @throws Error if max retries reached without successful rebalance
    */
-  async rebalanceIter(swapInfo, acc, estimateCall, retry = 0, adjustmentFactor = 1, isToken0Deficit = true) {
-    const MAX_RETRIES = 20;
-    const MIN_ADJUSTMENT = 1e-3;
+  async rebalanceIter(swapInfo, acc, estimateCall, isSellTokenToken0 = true, retry = 0, lowerLimit = 0n, upperLimit = 0n) {
+    const MAX_RETRIES = 40;
     logger.verbose(
-      `Rebalancing ${this.metadata.name}: retry=${retry}, adjustment=${adjustmentFactor}%, token0Deficit=${isToken0Deficit}`
+      `Rebalancing ${this.metadata.name}: retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}`
     );
     const fromAmount = import_starknet9.uint256.uint256ToBN(swapInfo.token_from_amount);
     logger.verbose(
@@ -18738,38 +18737,69 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
         logger.error(`Rebalance failed after ${MAX_RETRIES} retries`);
         throw err;
       }
-      if (adjustmentFactor < MIN_ADJUSTMENT) {
-        logger.error("Adjustment factor too small, likely oscillating");
-        throw new Error("Failed to converge on valid swap amount");
-      }
       logger.error(`Rebalance attempt ${retry + 1} failed, adjusting swap amount...`);
       const newSwapInfo = { ...swapInfo };
       const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+      logger.verbose(`Current amount: ${currentAmount.toString()}`);
       if (err.message.includes("invalid token0 balance") || err.message.includes("invalid token0 amount")) {
-        logger.verbose("Reducing swap amount - excess token0");
-        newSwapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(
-          currentAmount.multipliedBy((100 - adjustmentFactor) / 100).toWei()
-        );
-        adjustmentFactor = isToken0Deficit ? adjustmentFactor * 2 : adjustmentFactor / 2;
-        isToken0Deficit = true;
-      } else if (err.message.includes("invalid token1 balance") || err.message.includes("invalid token1 amount")) {
-        logger.verbose("Increasing swap amount - excess token1");
-        newSwapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(
-          currentAmount.multipliedBy((100 + adjustmentFactor) / 100).toWei()
-        );
-        adjustmentFactor = isToken0Deficit ? adjustmentFactor / 2 : adjustmentFactor * 2;
-        isToken0Deficit = false;
+        if (!isSellTokenToken0) {
+          logger.verbose("Reducing swap amount - excess token0");
+          let nextAmount = (fromAmount + lowerLimit) / 2n;
+          upperLimit = fromAmount;
+          if (nextAmount <= lowerLimit) {
+            logger.error("Convergence failed: nextAmount <= lowerLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(nextAmount);
+        } else {
+          logger.verbose("Increasing swap amount - deficit token0");
+          let nextAmount = (fromAmount + upperLimit) / 2n;
+          if (upperLimit == 0n) {
+            nextAmount = fromAmount * 2n;
+          }
+          lowerLimit = fromAmount;
+          if (upperLimit != 0n && nextAmount >= upperLimit) {
+            logger.error("Convergence failed: nextAmount >= upperLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(nextAmount);
+        }
+      } else if (err.message.includes("invalid token1 amount") || err.message.includes("invalid token1 balance")) {
+        if (isSellTokenToken0) {
+          logger.verbose("Reducing swap amount - excess token1");
+          let nextAmount = (fromAmount + lowerLimit) / 2n;
+          upperLimit = fromAmount;
+          if (nextAmount <= lowerLimit) {
+            logger.error("Convergence failed: nextAmount <= lowerLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(nextAmount);
+        } else {
+          logger.verbose("Increasing swap amount - deficit token1");
+          let nextAmount = (fromAmount + upperLimit) / 2n;
+          if (upperLimit == 0n) {
+            nextAmount = fromAmount * 2n;
+          }
+          lowerLimit = fromAmount;
+          if (upperLimit != 0n && nextAmount >= upperLimit) {
+            logger.error("Convergence failed: nextAmount >= upperLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = import_starknet9.uint256.bnToUint256(nextAmount);
+        }
       } else {
         logger.error("Unexpected error:", err);
+        throw err;
       }
       newSwapInfo.token_to_min_amount = import_starknet9.uint256.bnToUint256("0");
       return this.rebalanceIter(
         newSwapInfo,
         acc,
         estimateCall,
+        isSellTokenToken0,
         retry + 1,
-        adjustmentFactor,
-        isToken0Deficit
+        lowerLimit,
+        upperLimit
       );
     }
   }

package/dist/index.mjs

@@ -125,7 +125,7 @@ var FatalError = class extends Error {
 var defaultTokens = [{
   name: "Starknet",
   symbol: "STRK",
-  logo: "https://assets.coingecko.com/coins/images/26433/small/starknet.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/strk.svg",
   address: ContractAddr.from("0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"),
   decimals: 18,
   coingeckId: "starknet",
@@ -133,7 +133,7 @@ var defaultTokens = [{
 }, {
   name: "xSTRK",
   symbol: "xSTRK",
-  logo: "https://dashboard.endur.fi/endur-fi.svg",
+  logo: "https://assets.strkfarm.com/integrations/tokens/xstrk.svg",
   address: ContractAddr.from("0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a"),
   decimals: 18,
   coingeckId: void 0,
@@ -141,7 +141,7 @@ var defaultTokens = [{
 }, {
   name: "ETH",
   symbol: "ETH",
-  logo: "https://opbnb.bscscan.com/token/images/ether.svg",
+  logo: "https://assets.strkfarm.com/integrations/tokens/eth.svg",
   address: ContractAddr.from("0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"),
   decimals: 18,
   coingeckId: void 0,
@@ -149,7 +149,7 @@ var defaultTokens = [{
 }, {
   name: "USDC",
   symbol: "USDC",
-  logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/usdc.svg",
   address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
   decimals: 6,
   coingeckId: void 0,
@@ -157,7 +157,7 @@ var defaultTokens = [{
 }, {
   name: "USDT",
   symbol: "USDT",
-  logo: "https://assets.coingecko.com/coins/images/325/small/Tether.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/usdc.svg",
   address: ContractAddr.from("0x68f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8"),
   decimals: 6,
   coingeckId: void 0,
@@ -165,7 +165,7 @@ var defaultTokens = [{
 }, {
   name: "WBTC",
   symbol: "WBTC",
-  logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png",
+  logo: "https://assets.strkfarm.com/integrations/tokens/wbtc.svg",
   address: ContractAddr.from("0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac"),
   decimals: 8,
   coingeckId: void 0,
@@ -189,7 +189,7 @@ var Global = class _Global {
   }
   static async getTokens() {
     if (tokens.length) return tokens;
-    const data = await axios.get("https://starknet.api.avnu.fi/v1/starknet/tokens");
+    const data = await axios.get("https://assets.strkfarm.com/integrations/tokens.json");
     const tokensData = data.data.content;
     tokensData.forEach((token) => {
       if (!token.tags.includes("AVNU") || !token.tags.includes("Verified")) {
@@ -18650,11 +18650,10 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
    * @returns Array of contract calls needed for rebalancing
    * @throws Error if max retries reached without successful rebalance
    */
-  async rebalanceIter(swapInfo, acc, estimateCall, retry = 0, adjustmentFactor = 1, isToken0Deficit = true) {
-    const MAX_RETRIES = 20;
-    const MIN_ADJUSTMENT = 1e-3;
+  async rebalanceIter(swapInfo, acc, estimateCall, isSellTokenToken0 = true, retry = 0, lowerLimit = 0n, upperLimit = 0n) {
+    const MAX_RETRIES = 40;
     logger.verbose(
-      `Rebalancing ${this.metadata.name}: retry=${retry}, adjustment=${adjustmentFactor}%, token0Deficit=${isToken0Deficit}`
+      `Rebalancing ${this.metadata.name}: retry=${retry}, lowerLimit=${lowerLimit}, upperLimit=${upperLimit}, isSellTokenToken0=${isSellTokenToken0}`
     );
     const fromAmount = uint2564.uint256ToBN(swapInfo.token_from_amount);
     logger.verbose(
@@ -18669,38 +18668,69 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
         logger.error(`Rebalance failed after ${MAX_RETRIES} retries`);
         throw err;
       }
-      if (adjustmentFactor < MIN_ADJUSTMENT) {
-        logger.error("Adjustment factor too small, likely oscillating");
-        throw new Error("Failed to converge on valid swap amount");
-      }
       logger.error(`Rebalance attempt ${retry + 1} failed, adjusting swap amount...`);
       const newSwapInfo = { ...swapInfo };
       const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+      logger.verbose(`Current amount: ${currentAmount.toString()}`);
       if (err.message.includes("invalid token0 balance") || err.message.includes("invalid token0 amount")) {
-        logger.verbose("Reducing swap amount - excess token0");
-        newSwapInfo.token_from_amount = uint2564.bnToUint256(
-          currentAmount.multipliedBy((100 - adjustmentFactor) / 100).toWei()
-        );
-        adjustmentFactor = isToken0Deficit ? adjustmentFactor * 2 : adjustmentFactor / 2;
-        isToken0Deficit = true;
-      } else if (err.message.includes("invalid token1 balance") || err.message.includes("invalid token1 amount")) {
-        logger.verbose("Increasing swap amount - excess token1");
-        newSwapInfo.token_from_amount = uint2564.bnToUint256(
-          currentAmount.multipliedBy((100 + adjustmentFactor) / 100).toWei()
-        );
-        adjustmentFactor = isToken0Deficit ? adjustmentFactor / 2 : adjustmentFactor * 2;
-        isToken0Deficit = false;
+        if (!isSellTokenToken0) {
+          logger.verbose("Reducing swap amount - excess token0");
+          let nextAmount = (fromAmount + lowerLimit) / 2n;
+          upperLimit = fromAmount;
+          if (nextAmount <= lowerLimit) {
+            logger.error("Convergence failed: nextAmount <= lowerLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        } else {
+          logger.verbose("Increasing swap amount - deficit token0");
+          let nextAmount = (fromAmount + upperLimit) / 2n;
+          if (upperLimit == 0n) {
+            nextAmount = fromAmount * 2n;
+          }
+          lowerLimit = fromAmount;
+          if (upperLimit != 0n && nextAmount >= upperLimit) {
+            logger.error("Convergence failed: nextAmount >= upperLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        }
+      } else if (err.message.includes("invalid token1 amount") || err.message.includes("invalid token1 balance")) {
+        if (isSellTokenToken0) {
+          logger.verbose("Reducing swap amount - excess token1");
+          let nextAmount = (fromAmount + lowerLimit) / 2n;
+          upperLimit = fromAmount;
+          if (nextAmount <= lowerLimit) {
+            logger.error("Convergence failed: nextAmount <= lowerLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        } else {
+          logger.verbose("Increasing swap amount - deficit token1");
+          let nextAmount = (fromAmount + upperLimit) / 2n;
+          if (upperLimit == 0n) {
+            nextAmount = fromAmount * 2n;
+          }
+          lowerLimit = fromAmount;
+          if (upperLimit != 0n && nextAmount >= upperLimit) {
+            logger.error("Convergence failed: nextAmount >= upperLimit");
+            throw err;
+          }
+          newSwapInfo.token_from_amount = uint2564.bnToUint256(nextAmount);
+        }
       } else {
         logger.error("Unexpected error:", err);
+        throw err;
       }
       newSwapInfo.token_to_min_amount = uint2564.bnToUint256("0");
       return this.rebalanceIter(
         newSwapInfo,
         acc,
         estimateCall,
+        isSellTokenToken0,
         retry + 1,
-        adjustmentFactor,
-        isToken0Deficit
+        lowerLimit,
+        upperLimit
       );
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "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

@@ -49,7 +49,7 @@ export class FatalError extends Error {
 const defaultTokens: TokenInfo[] = [{
     name: 'Starknet',
     symbol: 'STRK',
-    logo: 'https://assets.coingecko.com/coins/images/26433/small/starknet.png',
+    logo: 'https://assets.strkfarm.com/integrations/tokens/strk.svg',
     address: ContractAddr.from('0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d'),
     decimals: 18,
     coingeckId: 'starknet',
@@ -57,7 +57,7 @@ const defaultTokens: TokenInfo[] = [{
 }, {
     name: 'xSTRK',
     symbol: 'xSTRK',
-    logo: 'https://dashboard.endur.fi/endur-fi.svg',
+    logo: 'https://assets.strkfarm.com/integrations/tokens/xstrk.svg',
     address: ContractAddr.from('0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a'),
     decimals: 18,
     coingeckId: undefined,
@@ -65,7 +65,7 @@ const defaultTokens: TokenInfo[] = [{
 }, {
     name: 'ETH',
     symbol: 'ETH',
-    logo: 'https://opbnb.bscscan.com/token/images/ether.svg',
+    logo: 'https://assets.strkfarm.com/integrations/tokens/eth.svg',
     address: ContractAddr.from('0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7'),
     decimals: 18,
     coingeckId: undefined,
@@ -73,7 +73,7 @@ const defaultTokens: TokenInfo[] = [{
 }, {
     name: 'USDC',
     symbol: 'USDC',
-    logo: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+    logo: 'https://assets.strkfarm.com/integrations/tokens/usdc.svg',
     address: ContractAddr.from('0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8'),
     decimals: 6,
     coingeckId: undefined,
@@ -81,7 +81,7 @@ const defaultTokens: TokenInfo[] = [{
 }, {
     name: 'USDT',
     symbol: 'USDT',
-    logo: 'https://assets.coingecko.com/coins/images/325/small/Tether.png',
+    logo: 'https://assets.strkfarm.com/integrations/tokens/usdc.svg',
     address: ContractAddr.from('0x68f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8'),
     decimals: 6,
     coingeckId: undefined,
@@ -89,7 +89,7 @@ const defaultTokens: TokenInfo[] = [{
 }, {
     name: 'WBTC',
     symbol: 'WBTC',
-    logo: 'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
+    logo: 'https://assets.strkfarm.com/integrations/tokens/wbtc.svg',
     address: ContractAddr.from('0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac'),
     decimals: 8,
     coingeckId: undefined,
@@ -122,7 +122,7 @@ export class Global {
         if (tokens.length) return tokens;
 
         // fetch from avnu API
-        const data = await axios.get('https://starknet.api.avnu.fi/v1/starknet/tokens');
+        const data = await axios.get('https://assets.strkfarm.com/integrations/tokens.json');
         const tokensData = data.data.content;
 
         // Array of the following is returned