@strkfarm/sdk 1.0.28 → 1.0.29

package/dist/index.browser.global.js

@@ -6912,6 +6912,7 @@ var strkfarm_risk_engine = (() => {
   __export(index_browser_exports, {
     AutoCompounderSTRK: () => AutoCompounderSTRK,
     AvnuWrapper: () => AvnuWrapper,
+    BaseStrategy: () => BaseStrategy,
     ContractAddr: () => ContractAddr,
     ERC20: () => ERC20,
     EkuboCLVault: () => EkuboCLVault,
@@ -9435,19 +9436,19 @@ var strkfarm_risk_engine = (() => {
       return this.mul(10 ** this.decimals).toFixed(0);
     }
     multipliedBy(value) {
-      let _value = Number(value).toFixed(this.maxToFixedDecimals());
+      const _value = this.getStandardString(value);
       return this.construct(this.mul(_value).toString(), this.decimals);
     }
     dividedBy(value) {
-      let _value = Number(value).toFixed(this.maxToFixedDecimals());
+      const _value = this.getStandardString(value);
       return this.construct(this.div(_value).toString(), this.decimals);
     }
     plus(value) {
-      const _value = Number(value).toFixed(this.maxToFixedDecimals());
+      const _value = this.getStandardString(value);
       return this.construct(this.add(_value).toString(), this.decimals);
     }
     minus(n, base2) {
-      const _value = Number(n).toFixed(this.maxToFixedDecimals());
+      const _value = this.getStandardString(n);
       return this.construct(super.minus(_value, base2).toString(), this.decimals);
     }
     construct(value, decimals) {
@@ -9463,11 +9464,17 @@ var strkfarm_risk_engine = (() => {
       return this.toString();
     }
     maxToFixedDecimals() {
-      return Math.min(this.decimals, 13);
+      return Math.min(this.decimals, 18);
+    }
+    getStandardString(value) {
+      if (typeof value == "string") {
+        return value;
+      }
+      return value.toFixed(this.maxToFixedDecimals());
     }
   };
-  import_bignumber.default.config({ DECIMAL_PLACES: 18 });
-  _Web3Number.config({ DECIMAL_PLACES: 18 });
+  import_bignumber.default.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: import_bignumber.default.ROUND_DOWN });
+  _Web3Number.config({ DECIMAL_PLACES: 18, ROUNDING_MODE: import_bignumber.default.ROUND_DOWN });
 
   // src/dataTypes/bignumber.browser.ts
   var Web3Number = class _Web3Number2 extends _Web3Number {
@@ -27218,42 +27225,48 @@ ${JSON.stringify(data, null, 2)}`;
     logo: "https://assets.coingecko.com/coins/images/26433/small/starknet.png",
     address: ContractAddr.from("0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"),
     decimals: 18,
-    coingeckId: "starknet"
+    coingeckId: "starknet",
+    displayDecimals: 2
   }, {
     name: "xSTRK",
     symbol: "xSTRK",
     logo: "https://dashboard.endur.fi/endur-fi.svg",
     address: ContractAddr.from("0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a"),
     decimals: 18,
-    coingeckId: void 0
+    coingeckId: void 0,
+    displayDecimals: 2
   }, {
     name: "ETH",
     symbol: "ETH",
     logo: "https://opbnb.bscscan.com/token/images/ether.svg",
     address: ContractAddr.from("0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"),
     decimals: 18,
-    coingeckId: void 0
+    coingeckId: void 0,
+    displayDecimals: 4
   }, {
     name: "USDC",
     symbol: "USDC",
     logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png",
     address: ContractAddr.from("0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8"),
     decimals: 6,
-    coingeckId: void 0
+    coingeckId: void 0,
+    displayDecimals: 2
   }, {
     name: "USDT",
     symbol: "USDT",
     logo: "https://assets.coingecko.com/coins/images/325/small/Tether.png",
     address: ContractAddr.from("0x68f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8"),
     decimals: 6,
-    coingeckId: void 0
+    coingeckId: void 0,
+    displayDecimals: 2
   }, {
     name: "WBTC",
     symbol: "WBTC",
     logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png",
     address: ContractAddr.from("0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac"),
     decimals: 8,
-    coingeckId: void 0
+    coingeckId: void 0,
+    displayDecimals: 6
   }];
   var tokens = defaultTokens;
   var Global = class _Global {
@@ -27285,7 +27298,8 @@ ${JSON.stringify(data, null, 2)}`;
           address: ContractAddr.from(token.address),
           decimals: token.decimals,
           logo: token.logoUri,
-          coingeckId: token.extensions.coingeckoId
+          coingeckId: token.extensions.coingeckoId,
+          displayDecimals: 2
         });
       });
       console.log(tokens);
@@ -27655,7 +27669,8 @@ ${JSON.stringify(data, null, 2)}`;
             logo: "",
             decimals: pool.token.decimals,
             borrowFactor: Web3Number.fromWei(pool.borrow_factor.value, pool.borrow_factor.decimals),
-            collareralFactor
+            collareralFactor,
+            displayDecimals: 2
           };
           this.tokens.push(token);
         });
@@ -27771,7 +27786,7 @@ ${JSON.stringify(data, null, 2)}`;
       try {
         return await this.getPriceFromMyAPI(tokenSymbol);
       } catch (e) {
-        logger2.warn("getPriceFromMyAPI error", e);
+        logger2.warn("getPriceFromMyAPI error", JSON.stringify(e.message || e));
       }
       logger2.log("getPrice coinbase", tokenSymbol);
       let retry = 0;
@@ -27791,7 +27806,7 @@ ${JSON.stringify(data, null, 2)}`;
             timestamp: /* @__PURE__ */ new Date()
           };
         } catch (e) {
-          logger2.warn("getPrice coinbase error", e, retry);
+          logger2.warn("getPrice coinbase error", JSON.stringify(e.message || e));
           await new Promise((resolve) => setTimeout(resolve, retry * 1e3));
         }
       }
@@ -27805,9 +27820,6 @@ ${JSON.stringify(data, null, 2)}`;
       const priceInfo = await priceInfoRes.json();
       const now = /* @__PURE__ */ new Date();
       const priceTime = new Date(priceInfo.timestamp);
-      if (now.getTime() - priceTime.getTime() > 9e5) {
-        throw new Error("Price is stale");
-      }
       const price = Number(priceInfo.price);
       return {
         price,
@@ -29280,17 +29292,28 @@ ${JSON.stringify(data, null, 2)}`;
   }
 
   // src/modules/avnu.ts
-  var AvnuWrapper = class {
-    async getQuotes(fromToken, toToken, amountWei, taker) {
+  var AvnuWrapper = class _AvnuWrapper {
+    async getQuotes(fromToken, toToken, amountWei, taker, retry = 0) {
+      const MAX_RETRY = 5;
+      logger2.verbose(`${_AvnuWrapper.name}: getQuotes => Getting quotes for ${fromToken} -> ${toToken}, amount: ${amountWei}, taker: ${taker}, retry: ${retry}`);
       const params = {
         sellTokenAddress: fromToken,
         buyTokenAddress: toToken,
         sellAmount: amountWei,
-        takerAddress: taker
+        takerAddress: taker,
+        //   excludeSources: ['Nostra', 'Haiko(Solvers)']
+        excludeSources: ["Haiko(Solvers)"]
+        // to resolve InvalidOraclePrice error
       };
       assert3(fromToken != toToken, "From and to tokens are the same");
       const quotes = await fetchQuotes(params);
-      assert3(quotes.length > 0, "No quotes found");
+      if (quotes.length == 0) {
+        if (retry < MAX_RETRY) {
+          await new Promise((res) => setTimeout(res, 3e3));
+          return await this.getQuotes(fromToken, toToken, amountWei, taker, retry + 1);
+        }
+        throw new Error("no quotes found");
+      }
       return quotes[0];
     }
     async getSwapInfo(quote, taker, integratorFeeBps, integratorFeeRecipient, minAmount) {
@@ -30958,10 +30981,10 @@ ${JSON.stringify(data, null, 2)}`;
     async getTVL() {
       throw new Error("Not implemented");
     }
-    depositCall(amountInfo, receiver) {
+    async depositCall(amountInfo, receiver) {
       throw new Error("Not implemented");
     }
-    withdrawCall(amountInfo, receiver, owner) {
+    async withdrawCall(amountInfo, receiver, owner) {
       throw new Error("Not implemented");
     }
   };
@@ -30997,7 +31020,7 @@ ${JSON.stringify(data, null, 2)}`;
      * @param receiver - Address that will receive the strategy tokens
      * @returns Populated contract call for deposit
      */
-    depositCall(amountInfo, receiver) {
+    async depositCall(amountInfo, receiver) {
       assert3(amountInfo.tokenInfo.address.eq(this.asset().address), "Deposit token mismatch");
       const assetContract = new Contract(vesu_rebalance_abi_default, this.asset().address.address, this.config.provider);
       const call1 = assetContract.populate("approve", [this.address.address, uint256_exports.bnToUint256(amountInfo.amount.toWei())]);
@@ -31011,7 +31034,7 @@ ${JSON.stringify(data, null, 2)}`;
      * @param owner - Address that owns the strategy tokens
      * @returns Populated contract call for withdrawal
      */
-    withdrawCall(amountInfo, receiver, owner) {
+    async withdrawCall(amountInfo, receiver, owner) {
       return [this.contract.populate("withdraw", [uint256_exports.bnToUint256(amountInfo.amount.toWei()), receiver.address, owner.address])];
     }
     /**
@@ -36312,6 +36335,57 @@ ${JSON.stringify(data, null, 2)}`;
     }
   ];
 
+  // src/modules/harvests.ts
+  var Harvests = class _Harvests {
+    constructor(config3) {
+      this.config = config3;
+    }
+    getHarvests(addr) {
+      throw new Error("Not implemented");
+    }
+    async getUnHarvestedRewards(addr) {
+      const rewards = await this.getHarvests(addr);
+      if (rewards.length == 0) return [];
+      const unClaimed = [];
+      const cls = await this.config.provider.getClassAt(rewards[0].rewardsContract.address);
+      for (let reward of rewards) {
+        const contract = new Contract(cls.abi, reward.rewardsContract.address, this.config.provider);
+        const isClaimed = await contract.call("is_claimed", [reward.claim.id]);
+        logger2.verbose(`${_Harvests.name}: isClaimed: ${isClaimed}`);
+        if (isClaimed)
+          return unClaimed;
+        unClaimed.unshift(reward);
+      }
+      return unClaimed;
+    }
+  };
+  var EkuboHarvests = class extends Harvests {
+    async getHarvests(addr) {
+      const STRK = "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
+      const EKUBO_API = `https://starknet-mainnet-api.ekubo.org/airdrops/${addr.address}?token=${STRK}`;
+      const resultEkubo = await fetch(EKUBO_API);
+      const items = await resultEkubo.json();
+      const rewards = [];
+      for (let i = 0; i < items.length; ++i) {
+        const info = items[i];
+        assert3(info.token == STRK, "expected strk token only");
+        rewards.push({
+          rewardsContract: ContractAddr.from(info.contract_address),
+          token: ContractAddr.from(STRK),
+          startDate: new Date(info.start_date),
+          endDate: new Date(info.end_date),
+          claim: {
+            id: info.claim.id,
+            amount: Web3Number.fromWei(info.claim.amount, 18),
+            claimee: ContractAddr.from(info.claim.claimee)
+          },
+          proof: info.proof
+        });
+      }
+      return rewards.sort((a, b) => b.endDate.getTime() - a.endDate.getTime());
+    }
+  };
+
   // src/strategies/ekubo-cl-vault.ts
   var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
     /**
@@ -36336,11 +36410,66 @@ ${JSON.stringify(data, null, 2)}`;
       this.ekuboMathContract = new Contract(ekubo_math_abi_default, EKUBO_MATH, this.config.provider);
       this.avnu = new AvnuWrapper();
     }
-    depositCall(amountInfo, receiver) {
-      return [];
+    async matchInputAmounts(amountInfo) {
+      const bounds = await this.getCurrentBounds();
+      const res = await this._getExpectedAmountsForLiquidity(
+        amountInfo.token0.amount,
+        amountInfo.token1.amount,
+        bounds,
+        false
+      );
+      return {
+        token0: {
+          tokenInfo: amountInfo.token0.tokenInfo,
+          amount: res.amount0
+        },
+        token1: {
+          tokenInfo: amountInfo.token1.tokenInfo,
+          amount: res.amount1
+        }
+      };
     }
-    withdrawCall(amountInfo, receiver, owner) {
-      return [];
+    /** Returns minimum amounts give given two amounts based on what can be added for liq */
+    async getMinDepositAmounts(amountInfo) {
+      const shares = await this.tokensToShares(amountInfo);
+      const { amount0, amount1 } = await this.contract.call("convert_to_assets", [uint256_exports.bnToUint256(shares.toWei())]);
+      return {
+        token0: {
+          tokenInfo: amountInfo.token0.tokenInfo,
+          amount: Web3Number.fromWei(amount0.toString(), amountInfo.token0.tokenInfo.decimals)
+        },
+        token1: {
+          tokenInfo: amountInfo.token1.tokenInfo,
+          amount: Web3Number.fromWei(amount1.toString(), amountInfo.token1.tokenInfo.decimals)
+        }
+      };
+    }
+    async depositCall(amountInfo, receiver) {
+      const updateAmountInfo = await this.getMinDepositAmounts(amountInfo);
+      const token0Contract = new Contract(erc4626_abi_default, amountInfo.token0.tokenInfo.address.address, this.config.provider);
+      const token1Contract = new Contract(erc4626_abi_default, amountInfo.token1.tokenInfo.address.address, this.config.provider);
+      const call1 = token0Contract.populate("approve", [this.address.address, uint256_exports.bnToUint256(updateAmountInfo.token0.amount.toWei())]);
+      const call2 = token1Contract.populate("approve", [this.address.address, uint256_exports.bnToUint256(updateAmountInfo.token1.amount.toWei())]);
+      const call3 = this.contract.populate("deposit", [uint256_exports.bnToUint256(updateAmountInfo.token0.amount.toWei()), uint256_exports.bnToUint256(updateAmountInfo.token1.amount.toWei()), receiver.address]);
+      const calls = [];
+      if (updateAmountInfo.token0.amount.greaterThan(0)) calls.push(call1);
+      if (updateAmountInfo.token1.amount.greaterThan(0)) calls.push(call2);
+      return [...calls, call3];
+    }
+    async tokensToShares(amountInfo) {
+      const shares = await this.contract.call("convert_to_shares", [
+        uint256_exports.bnToUint256(amountInfo.token0.amount.toWei()),
+        uint256_exports.bnToUint256(amountInfo.token1.amount.toWei())
+      ]);
+      return Web3Number.fromWei(shares.toString(), 18);
+    }
+    async withdrawCall(amountInfo, receiver, owner) {
+      const shares = await this.tokensToShares(amountInfo);
+      logger2.verbose(`${_EkuboCLVault.name}: withdrawCall: shares=${shares.toString()}`);
+      return [this.contract.populate("withdraw", [
+        uint256_exports.bnToUint256(shares.toWei()),
+        receiver.address
+      ])];
     }
     rebalanceCall(newBounds, swapParams) {
       return [this.contract.populate("rebalance", [
@@ -36359,14 +36488,113 @@ ${JSON.stringify(data, null, 2)}`;
     handleFeesCall() {
       return [this.contract.populate("handle_fees", [])];
     }
-    async getUserTVL(user) {
-      throw new Error("Not implemented");
+    /**
+     * Calculates assets before and now in a given token of TVL per share to observe growth
+     * @returns {Promise<number>} The weighted average APY across all pools
+     */
+    async netAPY(blockIdentifier = "pending", sinceBlocks = 2e4) {
+      const tvlNow = await this._getTVL(blockIdentifier);
+      const supplyNow = await this.totalSupply(blockIdentifier);
+      const priceNow = await this.getCurrentPrice(blockIdentifier);
+      let blockNow = typeof blockIdentifier == "number" ? blockIdentifier : (await this.config.provider.getBlockLatestAccepted()).block_number;
+      const blockNowTime = typeof blockIdentifier == "number" ? (await this.config.provider.getBlockWithTxs(blockIdentifier)).timestamp : (/* @__PURE__ */ new Date()).getTime() / 1e3;
+      const blockBefore = blockNow - sinceBlocks;
+      const adjustedSupplyNow = supplyNow.minus(await this.getHarvestRewardShares(blockBefore, blockNow));
+      let blockBeforeInfo = await this.config.provider.getBlockWithTxs(blockBefore);
+      const tvlBefore = await this._getTVL(blockBefore);
+      const supplyBefore = await this.totalSupply(blockBefore);
+      const priceBefore = await this.getCurrentPrice(blockBefore);
+      const tvlInToken0Now = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
+      const tvlPerShareNow = tvlInToken0Now.multipliedBy(1e18).dividedBy(adjustedSupplyNow);
+      const tvlInToken0Bf = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
+      const tvlPerShareBf = tvlInToken0Bf.multipliedBy(1e18).dividedBy(supplyBefore);
+      const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
+      logger2.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
+      logger2.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
+      logger2.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
+      logger2.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
+      logger2.verbose(`Price before: ${priceBefore.price.toString()}`);
+      logger2.verbose(`Price now: ${priceNow.price.toString()}`);
+      logger2.verbose(`Supply before: ${supplyBefore.toString()}`);
+      logger2.verbose(`Supply now: ${adjustedSupplyNow.toString()}`);
+      logger2.verbose(`Time diff in seconds: ${timeDiffSeconds}`);
+      const apyForGivenBlocks = Number(tvlPerShareNow.minus(tvlPerShareBf).multipliedBy(1e4).dividedBy(tvlPerShareBf)) / 1e4;
+      return apyForGivenBlocks * (365 * 24 * 3600) / timeDiffSeconds;
+    }
+    async getHarvestRewardShares(fromBlock, toBlock) {
+      const len = Number(await this.contract.call("get_total_rewards"));
+      let shares = Web3Number.fromWei(0, 18);
+      for (let i = len - 1; i > 0; --i) {
+        let record = await this.contract.call("get_rewards_info", [i]);
+        logger2.verbose(`${_EkuboCLVault.name}: getHarvestRewardShares: ${i}`);
+        console.log(record);
+        const block = Number(record.block_number);
+        if (block < fromBlock) {
+          return shares;
+        } else if (block > toBlock) {
+          continue;
+        } else {
+          shares = shares.plus(Web3Number.fromWei(record.shares.toString(), 18));
+        }
+        logger2.verbose(`${_EkuboCLVault.name}: getHarvestRewardShares: ${i} => ${shares.toWei()}`);
+      }
+      return shares;
     }
-    async getTVL() {
-      const result = await this.contract.call("total_liquidity", []);
-      const bounds = await this.getCurrentBounds();
-      const { amount0, amount1 } = await this.getLiquidityToAmounts(Web3Number.fromWei(result.toString(), 18), bounds);
-      const poolKey = await this.getPoolKey();
+    async balanceOf(user, blockIdentifier = "pending") {
+      let bal = await this.contract.call("balance_of", [user.address]);
+      return Web3Number.fromWei(bal.toString(), 18);
+    }
+    async getUserTVL(user, blockIdentifier = "pending") {
+      let bal = await this.balanceOf(user, blockIdentifier);
+      const assets = await this.contract.call("convert_to_assets", [uint256_exports.bnToUint256(bal.toWei())], {
+        blockIdentifier
+      });
+      const poolKey = await this.getPoolKey(blockIdentifier);
+      this.assertValidDepositTokens(poolKey);
+      const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
+      const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
+      const amount0 = Web3Number.fromWei(assets.amount0.toString(), token0Info.decimals);
+      const amount1 = Web3Number.fromWei(assets.amount1.toString(), token1Info.decimals);
+      const P0 = await this.pricer.getPrice(token0Info.symbol);
+      const P1 = await this.pricer.getPrice(token1Info.symbol);
+      const token0Usd = Number(amount0.toFixed(13)) * P0.price;
+      const token1Usd = Number(amount1.toFixed(13)) * P1.price;
+      return {
+        usdValue: token0Usd + token1Usd,
+        token0: {
+          tokenInfo: token0Info,
+          amount: amount0,
+          usdValue: token0Usd
+        },
+        token1: {
+          tokenInfo: token1Info,
+          amount: amount1,
+          usdValue: token1Usd
+        }
+      };
+    }
+    async _getTVL(blockIdentifier = "pending") {
+      const result = await this.contract.call("total_liquidity", [], {
+        blockIdentifier
+      });
+      const bounds = await this.getCurrentBounds(blockIdentifier);
+      const { amount0, amount1 } = await this.getLiquidityToAmounts(Web3Number.fromWei(result.toString(), 18), bounds, blockIdentifier);
+      return { amount0, amount1 };
+    }
+    async totalSupply(blockIdentifier = "pending") {
+      const res = await this.contract.call("total_supply", [], {
+        blockIdentifier
+      });
+      return Web3Number.fromWei(res.toString(), 18);
+    }
+    assertValidDepositTokens(poolKey) {
+      assert3(poolKey.token0.eq(this.metadata.depositTokens[0].address), "Expected token0 in depositTokens[0]");
+      assert3(poolKey.token1.eq(this.metadata.depositTokens[1].address), "Expected token1 in depositTokens[1]");
+    }
+    async getTVL(blockIdentifier = "pending") {
+      const { amount0, amount1 } = await this._getTVL(blockIdentifier);
+      const poolKey = await this.getPoolKey(blockIdentifier);
+      this.assertValidDepositTokens(poolKey);
       const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
       const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
       const P0 = await this.pricer.getPrice(token0Info.symbol);
@@ -36374,7 +36602,7 @@ ${JSON.stringify(data, null, 2)}`;
       const token0Usd = Number(amount0.toFixed(13)) * P0.price;
       const token1Usd = Number(amount1.toFixed(13)) * P1.price;
       return {
-        netUsdValue: token0Usd + token1Usd,
+        usdValue: token0Usd + token1Usd,
         token0: {
           tokenInfo: token0Info,
           amount: amount0,
@@ -36414,7 +36642,7 @@ ${JSON.stringify(data, null, 2)}`;
       const token0Usd = Number(token0Web3.toFixed(13)) * P0.price;
       const token1Usd = Number(token1Web3.toFixed(13)) * P1.price;
       return {
-        netUsdValue: token0Usd + token1Usd,
+        usdValue: token0Usd + token1Usd,
         token0: {
           tokenInfo: token0Info,
           amount: token0Web3,
@@ -36436,11 +36664,11 @@ ${JSON.stringify(data, null, 2)}`;
       const truePrice = Number(BigInt(result.toString()) * BigInt(1e9) / BigInt(1e18)) / 1e9;
       return truePrice;
     }
-    async getCurrentPrice() {
-      const poolKey = await this.getPoolKey();
-      return this._getCurrentPrice(poolKey);
+    async getCurrentPrice(blockIdentifier = "pending") {
+      const poolKey = await this.getPoolKey(blockIdentifier);
+      return this._getCurrentPrice(poolKey, blockIdentifier);
     }
-    async _getCurrentPrice(poolKey) {
+    async _getCurrentPrice(poolKey, blockIdentifier = "pending") {
       const priceInfo = await this.ekuboPositionsContract.call("get_pool_price", [
         {
           token0: poolKey.token0.address,
@@ -36449,17 +36677,24 @@ ${JSON.stringify(data, null, 2)}`;
           tick_spacing: poolKey.tick_spacing,
           extension: poolKey.extension
         }
-      ]);
+      ], {
+        blockIdentifier
+      });
       const sqrtRatio = _EkuboCLVault.div2Power128(BigInt(priceInfo.sqrt_ratio.toString()));
+      console.log(`EkuboCLVault: getCurrentPrice: blockIdentifier: ${blockIdentifier}, sqrtRatio: ${sqrtRatio}, ${priceInfo.sqrt_ratio.toString()}`);
       const price = sqrtRatio * sqrtRatio;
       const tick = _EkuboCLVault.priceToTick(price, true, Number(poolKey.tick_spacing));
+      console.log(`EkuboCLVault: getCurrentPrice: blockIdentifier: ${blockIdentifier}, price: ${price}, tick: ${tick.mag}, ${tick.sign}`);
       return {
         price,
-        tick: tick.mag * (tick.sign == 0 ? 1 : -1)
+        tick: tick.mag * (tick.sign == 0 ? 1 : -1),
+        sqrtRatio: priceInfo.sqrt_ratio.toString()
       };
     }
-    async getCurrentBounds() {
-      const result = await this.contract.call("get_position_key", []);
+    async getCurrentBounds(blockIdentifier = "pending") {
+      const result = await this.contract.call("get_position_key", [], {
+        blockIdentifier
+      });
       return {
         lowerTick: _EkuboCLVault.i129ToNumber(result.bounds.lower),
         upperTick: _EkuboCLVault.i129ToNumber(result.bounds.upper)
@@ -36473,11 +36708,13 @@ ${JSON.stringify(data, null, 2)}`;
       const tick = Math.floor(value / tickSpacing) * tickSpacing;
       return this.tickToi129(tick);
     }
-    async getPoolKey() {
+    async getPoolKey(blockIdentifier = "pending") {
       if (this.poolKey) {
         return this.poolKey;
       }
-      const result = await this.contract.call("get_settings", []);
+      const result = await this.contract.call("get_settings", [], {
+        blockIdentifier
+      });
       const poolKey = {
         token0: ContractAddr.from(result.pool_key.token0.toString()),
         token1: ContractAddr.from(result.pool_key.token1.toString()),
@@ -36508,25 +36745,24 @@ ${JSON.stringify(data, null, 2)}`;
      * @param amount1: amount of token1
      * @returns {amount0, amount1}
      */
-    async _getExpectedAmountsForLiquidity(amount0, amount1, bounds) {
+    async _getExpectedAmountsForLiquidity(amount0, amount1, bounds, justUseInputAmount = true) {
       assert3(amount0.greaterThan(0) || amount1.greaterThan(0), "Amount is 0");
-      const poolKey = await this.getPoolKey();
-      const sampleLiq = 1e18;
+      const sampleLiq = 1e20;
       const { amount0: sampleAmount0, amount1: sampleAmount1 } = await this.getLiquidityToAmounts(Web3Number.fromWei(sampleLiq.toString(), 18), bounds);
       logger2.verbose(`${_EkuboCLVault.name}: _getExpectedAmountsForLiquidity => sampleAmount0: ${sampleAmount0.toString()}, sampleAmount1: ${sampleAmount1.toString()}`);
-      assert3(!sampleAmount0.eq(0) && !sampleAmount1.eq(0), "Sample amount is 0");
+      assert3(!sampleAmount0.eq(0) || !sampleAmount1.eq(0), "Sample amount is 0");
       const price = await (await this.getCurrentPrice()).price;
       logger2.verbose(`${_EkuboCLVault.name}: _getExpectedAmountsForLiquidity => price: ${price}`);
       if (amount1.eq(0) && amount0.greaterThan(0)) {
         if (sampleAmount1.eq(0)) {
           return {
             amount0,
-            amount1: Web3Number.fromWei("0", 18),
+            amount1: Web3Number.fromWei("0", amount1.decimals),
             ratio: Infinity
           };
         } else if (sampleAmount0.eq(0)) {
           return {
-            amount0: Web3Number.fromWei("0", 18),
+            amount0: Web3Number.fromWei("0", amount0.decimals),
             amount1: amount0.multipliedBy(price),
             ratio: 0
           };
@@ -36534,21 +36770,41 @@ ${JSON.stringify(data, null, 2)}`;
       } else if (amount0.eq(0) && amount1.greaterThan(0)) {
         if (sampleAmount0.eq(0)) {
           return {
-            amount0: Web3Number.fromWei("0", 18),
+            amount0: Web3Number.fromWei("0", amount0.decimals),
             amount1,
             ratio: 0
           };
         } else if (sampleAmount1.eq(0)) {
           return {
             amount0: amount1.dividedBy(price),
-            amount1: Web3Number.fromWei("0", 18),
+            amount1: Web3Number.fromWei("0", amount1.decimals),
             ratio: Infinity
           };
         }
       }
-      const ratio = sampleAmount0.multipliedBy(1e18).dividedBy(sampleAmount1.toString()).dividedBy(1e18);
+      assert3(sampleAmount0.decimals == sampleAmount1.decimals, "Sample amounts have different decimals");
+      const ratioWeb3Number = sampleAmount0.multipliedBy(1e18).dividedBy(sampleAmount1.toString()).dividedBy(1e18);
+      const ratio = Number(ratioWeb3Number.toFixed(18));
       logger2.verbose(`${_EkuboCLVault.name}: ${this.metadata.name} => ratio: ${ratio.toString()}`);
-      return this._solveExpectedAmountsEq(amount0, amount1, ratio, price);
+      if (justUseInputAmount)
+        return this._solveExpectedAmountsEq(amount0, amount1, ratioWeb3Number, price);
+      if (amount1.eq(0) && amount0.greaterThan(0)) {
+        const _amount1 = amount0.dividedBy(ratioWeb3Number);
+        return {
+          amount0,
+          amount1: _amount1,
+          ratio
+        };
+      } else if (amount0.eq(0) && amount1.greaterThan(0)) {
+        const _amount0 = amount1.multipliedBy(ratio);
+        return {
+          amount0: _amount0,
+          amount1,
+          ratio
+        };
+      } else {
+        throw new Error("Both amounts are non-zero, cannot compute expected amounts");
+      }
     }
     _solveExpectedAmountsEq(availableAmount0, availableAmount1, ratio, price) {
       const y = ratio.multipliedBy(availableAmount1).minus(availableAmount0).dividedBy(ratio.plus(1 / price));
@@ -36562,10 +36818,11 @@ ${JSON.stringify(data, null, 2)}`;
     async getSwapInfoToHandleUnused(considerRebalance = true) {
       const poolKey = await this.getPoolKey();
       const erc20Mod = new ERC20(this.config);
-      const token0Bal1 = await erc20Mod.balanceOf(poolKey.token0, this.address.address, 18);
-      const token1Bal1 = await erc20Mod.balanceOf(poolKey.token1, this.address.address, 18);
       const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
       const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
+      const token0Bal1 = await erc20Mod.balanceOf(poolKey.token0, this.address.address, token0Info.decimals);
+      const token1Bal1 = await erc20Mod.balanceOf(poolKey.token1, this.address.address, token1Info.decimals);
+      logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => token0Bal1: ${token0Bal1.toString()}, token1Bal1: ${token1Bal1.toString()}`);
       const token0Price = await this.pricer.getPrice(token0Info.symbol);
       const token1Price = await this.pricer.getPrice(token1Info.symbol);
       const token0PriceUsd = token0Price.price * Number(token0Bal1.toFixed(13));
@@ -36576,6 +36833,7 @@ ${JSON.stringify(data, null, 2)}`;
       let token0Bal = token0Bal1;
       let token1Bal = token1Bal1;
       if (considerRebalance) {
+        logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => considerRebalance: true`);
         const tvl = await this.getTVL();
         token0Bal = token0Bal.plus(tvl.token0.amount.toString());
         token1Bal = token1Bal.plus(tvl.token1.amount.toString());
@@ -36585,7 +36843,10 @@ ${JSON.stringify(data, null, 2)}`;
       logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => token0Bal: ${token0Bal.toString()}, token1Bal: ${token1Bal.toString()}`);
       const newBounds = await this.getNewBounds();
       logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => newBounds: ${newBounds.lowerTick}, ${newBounds.upperTick}`);
-      let expectedAmounts = await this._getExpectedAmountsForLiquidity(token0Bal, token1Bal, newBounds);
+      return await this.getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, newBounds);
+    }
+    async getSwapInfoGivenAmounts(poolKey, token0Bal, token1Bal, bounds) {
+      let expectedAmounts = await this._getExpectedAmountsForLiquidity(token0Bal, token1Bal, bounds);
       logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => expectedAmounts: ${expectedAmounts.amount0.toString()}, ${expectedAmounts.amount1.toString()}`);
       let retry = 0;
       const maxRetry = 10;
@@ -36606,6 +36867,19 @@ ${JSON.stringify(data, null, 2)}`;
         logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => tokenToSell: ${tokenToSell.address}, tokenToBuy: ${tokenToBuy.address}, amountToSell: ${amountToSell.toWei()}`);
         logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => remainingSellAmount: ${remainingSellAmount.toString()}`);
         logger2.verbose(`${_EkuboCLVault.name}: getSwapInfoToHandleUnused => expectedRatio: ${expectedRatio}`);
+        if (amountToSell.eq(0)) {
+          return {
+            token_from_address: tokenToSell.address,
+            token_from_amount: uint256_exports.bnToUint256(0),
+            token_to_address: tokenToSell.address,
+            token_to_amount: uint256_exports.bnToUint256(0),
+            token_to_min_amount: uint256_exports.bnToUint256(0),
+            beneficiary: this.address.address,
+            integrator_fee_amount_bps: 0,
+            integrator_fee_recipient: this.address.address,
+            routes: []
+          };
+        }
         const quote = await this.avnu.getQuotes(tokenToSell.address, tokenToBuy.address, amountToSell.toWei(), this.address.address);
         if (remainingSellAmount.eq(0)) {
           const minAmountOut = Web3Number.fromWei(quote.buyAmount.toString(), tokenToBuyInfo.decimals).multipliedBy(0.9999);
@@ -36628,6 +36902,73 @@ ${JSON.stringify(data, null, 2)}`;
       }
       throw new Error("Failed to get swap info");
     }
+    /**
+     * Attempts to rebalance the vault by iteratively adjusting swap amounts if initial attempt fails.
+     * Uses binary search approach to find optimal swap amount.
+     * 
+     * @param newBounds - The new tick bounds to rebalance to 
+     * @param swapInfo - Initial swap parameters for rebalancing
+     * @param acc - Account to estimate gas fees with
+     * @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)
+     * @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;
+      logger2.verbose(
+        `Rebalancing ${this.metadata.name}: retry=${retry}, adjustment=${adjustmentFactor}%, token0Deficit=${isToken0Deficit}`
+      );
+      const fromAmount = uint256_exports.uint256ToBN(swapInfo.token_from_amount);
+      logger2.verbose(
+        `Selling ${fromAmount.toString()} of token ${swapInfo.token_from_address}`
+      );
+      try {
+        const calls = await estimateCall(swapInfo);
+        await acc.estimateInvokeFee(calls);
+        return calls;
+      } catch (err2) {
+        if (retry >= MAX_RETRIES) {
+          logger2.error(`Rebalance failed after ${MAX_RETRIES} retries`);
+          throw err2;
+        }
+        if (adjustmentFactor < MIN_ADJUSTMENT) {
+          logger2.error("Adjustment factor too small, likely oscillating");
+          throw new Error("Failed to converge on valid swap amount");
+        }
+        logger2.error(`Rebalance attempt ${retry + 1} failed, adjusting swap amount...`);
+        const newSwapInfo = { ...swapInfo };
+        const currentAmount = Web3Number.fromWei(fromAmount.toString(), 18);
+        if (err2.message.includes("invalid token0 balance") || err2.message.includes("invalid token0 amount")) {
+          logger2.verbose("Reducing swap amount - excess token0");
+          newSwapInfo.token_from_amount = uint256_exports.bnToUint256(
+            currentAmount.multipliedBy((100 - adjustmentFactor) / 100).toWei()
+          );
+          adjustmentFactor = isToken0Deficit ? adjustmentFactor * 2 : adjustmentFactor / 2;
+          isToken0Deficit = true;
+        } else if (err2.message.includes("invalid token1 balance") || err2.message.includes("invalid token1 amount")) {
+          logger2.verbose("Increasing swap amount - excess token1");
+          newSwapInfo.token_from_amount = uint256_exports.bnToUint256(
+            currentAmount.multipliedBy((100 + adjustmentFactor) / 100).toWei()
+          );
+          adjustmentFactor = isToken0Deficit ? adjustmentFactor / 2 : adjustmentFactor * 2;
+          isToken0Deficit = false;
+        } else {
+          logger2.error("Unexpected error:", err2);
+        }
+        newSwapInfo.token_to_min_amount = uint256_exports.bnToUint256("0");
+        return this.rebalanceIter(
+          newSwapInfo,
+          acc,
+          estimateCall,
+          retry + 1,
+          adjustmentFactor,
+          isToken0Deficit
+        );
+      }
+    }
     static tickToi129(tick) {
       if (tick < 0) {
         return {
@@ -36650,21 +36991,23 @@ ${JSON.stringify(data, null, 2)}`;
     static tickToPrice(tick) {
       return Math.pow(1.000001, Number(tick));
     }
-    async getLiquidityToAmounts(liquidity, bounds) {
-      const currentPrice = await this.getCurrentPrice();
-      const lowerPrice = await _EkuboCLVault.tickToPrice(bounds.lowerTick);
-      const upperPrice = await _EkuboCLVault.tickToPrice(bounds.upperTick);
+    async getLiquidityToAmounts(liquidity, bounds, blockIdentifier = "pending", _poolKey = null, _currentPrice = null) {
+      const currentPrice = _currentPrice || await this.getCurrentPrice(blockIdentifier);
+      const lowerPrice = _EkuboCLVault.tickToPrice(bounds.lowerTick);
+      const upperPrice = _EkuboCLVault.tickToPrice(bounds.upperTick);
       logger2.verbose(`${_EkuboCLVault.name}: getLiquidityToAmounts => currentPrice: ${currentPrice.price}, lowerPrice: ${lowerPrice}, upperPrice: ${upperPrice}`);
       const result = await this.ekuboMathContract.call("liquidity_delta_to_amount_delta", [
-        uint256_exports.bnToUint256(_EkuboCLVault.priceToSqrtRatio(currentPrice.price).toString()),
+        uint256_exports.bnToUint256(currentPrice.sqrtRatio),
         {
           mag: liquidity.toWei(),
           sign: 0
         },
         uint256_exports.bnToUint256(_EkuboCLVault.priceToSqrtRatio(lowerPrice).toString()),
         uint256_exports.bnToUint256(_EkuboCLVault.priceToSqrtRatio(upperPrice).toString())
-      ]);
-      const poolKey = await this.getPoolKey();
+      ], {
+        blockIdentifier
+      });
+      const poolKey = _poolKey || await this.getPoolKey(blockIdentifier);
       const token0Info = await Global.getTokenInfoFromAddr(poolKey.token0);
       const token1Info = await Global.getTokenInfoFromAddr(poolKey.token1);
       const amount0 = Web3Number.fromWei(_EkuboCLVault.i129ToNumber(result.amount0).toString(), token0Info.decimals);
@@ -36674,32 +37017,110 @@ ${JSON.stringify(data, null, 2)}`;
         amount1
       };
     }
+    async harvest(acc) {
+      const ekuboHarvests = new EkuboHarvests(this.config);
+      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();
+      const calls = [];
+      for (let claim of unClaimedRewards) {
+        const fee = claim.claim.amount.multipliedBy(this.metadata.additionalInfo.feeBps).dividedBy(1e4);
+        const postFeeAmount = claim.claim.amount.minus(fee);
+        const isToken1 = claim.token.eq(poolKey.token1);
+        logger2.verbose(`${_EkuboCLVault.name}: harvest => Processing claim, isToken1: ${isToken1} amount: ${postFeeAmount.toWei()}`);
+        const token0Amt = isToken1 ? new Web3Number(0, token0Info.decimals) : postFeeAmount;
+        const token1Amt = isToken1 ? postFeeAmount : new Web3Number(0, token0Info.decimals);
+        logger2.verbose(`${_EkuboCLVault.name}: harvest => token0Amt: ${token0Amt.toString()}, token1Amt: ${token1Amt.toString()}`);
+        const swapInfo = await this.getSwapInfoGivenAmounts(poolKey, token0Amt, token1Amt, bounds);
+        swapInfo.token_to_address = token0Info.address.address;
+        logger2.verbose(`${_EkuboCLVault.name}: harvest => swapInfo: ${JSON.stringify(swapInfo)}`);
+        logger2.verbose(`${_EkuboCLVault.name}: harvest => claim: ${JSON.stringify(claim)}`);
+        const harvestEstimateCall = async (swapInfo1) => {
+          const swap1Amount = Web3Number.fromWei(uint256_exports.uint256ToBN(swapInfo1.token_from_amount).toString(), 18);
+          const remainingAmount = postFeeAmount.minus(swap1Amount);
+          const swapInfo2 = { ...swapInfo, token_from_amount: uint256_exports.bnToUint256(remainingAmount.toWei()) };
+          swapInfo2.token_to_address = token1Info.address.address;
+          const calldata = [
+            claim.rewardsContract.address,
+            {
+              id: claim.claim.id,
+              amount: claim.claim.amount.toWei(),
+              claimee: claim.claim.claimee.address
+            },
+            claim.proof.map((p) => num_exports.getDecimalString(p)),
+            swapInfo,
+            swapInfo2
+          ];
+          logger2.verbose(`${_EkuboCLVault.name}: harvest => calldata: ${JSON.stringify(calldata)}`);
+          return [this.contract.populate("harvest", calldata)];
+        };
+        const _callsFinal = await this.rebalanceIter(swapInfo, acc, harvestEstimateCall);
+        logger2.verbose(`${_EkuboCLVault.name}: harvest => _callsFinal: ${JSON.stringify(_callsFinal)}`);
+        calls.push(..._callsFinal);
+      }
+      return calls;
+    }
+    async getInvestmentFlows() {
+      const netYield = await this.netAPY();
+      const poolKey = await this.getPoolKey();
+      const linkedFlow = {
+        title: this.metadata.name,
+        subItems: [{ key: "Pool", value: `${(_EkuboCLVault.div2Power128(BigInt(poolKey.fee)) * 100).toFixed(2)}%, ${poolKey.tick_spacing} tick spacing` }],
+        linkedFlows: [],
+        style: { backgroundColor: "#35484f" /* Blue */.valueOf() }
+      };
+      const baseFlow = {
+        id: "base",
+        title: "Your Deposit",
+        subItems: [{ key: `Net yield`, value: `${(netYield * 100).toFixed(2)}%` }, { key: `Performance Fee`, value: `${(this.metadata.additionalInfo.feeBps / 100).toFixed(2)}%` }],
+        linkedFlows: [linkedFlow],
+        style: { backgroundColor: "#6e53dc" /* Purple */.valueOf() }
+      };
+      const rebalanceFlow = {
+        id: "rebalance",
+        title: "Automated Rebalance",
+        subItems: [{
+          key: "Range selection",
+          value: `${this.metadata.additionalInfo.newBounds.lower * Number(poolKey.tick_spacing)} to ${this.metadata.additionalInfo.newBounds.upper * Number(poolKey.tick_spacing)} ticks`
+        }],
+        linkedFlows: [linkedFlow],
+        style: { backgroundColor: "purple" /* Green */.valueOf() }
+      };
+      return [baseFlow, rebalanceFlow];
+    }
   };
-  var _description2 = "Automatically rebalances liquidity near current price to maximize yield while reducing the necessity to manually rebalance positions frequently. Fees earn and Defi spring rewards are automatically re-invested.";
+  var _description2 = "Deploys your {{POOL_NAME}} into an Ekubo liquidity pool, automatically rebalancing positions around the current price to optimize yield and reduce the need for manual adjustments. Trading fees and DeFi Spring rewards are automatically compounded back into the strategy. In return, you receive an ERC-20 token representing your share of the strategy. The APY is calculated based on 7-day historical performance.";
   var _protocol2 = { name: "Ekubo", logo: "https://app.ekubo.org/favicon.ico" };
   var _riskFactor2 = [
     { type: "Smart Contract Risk" /* SMART_CONTRACT_RISK */, value: 0.5, weight: 25 },
     { type: "Impermanent Loss Risk" /* IMPERMANENT_LOSS */, value: 1, weight: 75 }
   ];
+  var AUDIT_URL2 = "https://assets.strkfarm.com/strkfarm/audit_report_vesu_and_ekubo_strats.pdf";
   var EkuboCLVaultStrategies = [{
     name: "Ekubo xSTRK/STRK",
-    description: _description2,
+    description: _description2.replace("{{POOL_NAME}}", "xSTRK/STRK"),
     address: ContractAddr.from("0x01f083b98674bc21effee29ef443a00c7b9a500fd92cf30341a3da12c73f2324"),
     type: "Other",
-    depositTokens: [Global.getDefaultTokens().find((t) => t.symbol === "STRK"), Global.getDefaultTokens().find((t) => t.symbol === "xSTRK")],
+    // must be same order as poolKey token0 and token1
+    depositTokens: [Global.getDefaultTokens().find((t) => t.symbol === "xSTRK"), Global.getDefaultTokens().find((t) => t.symbol === "STRK")],
     protocols: [_protocol2],
+    auditUrl: AUDIT_URL2,
     maxTVL: Web3Number.fromWei("0", 18),
     risk: {
       riskFactor: _riskFactor2,
       netRisk: _riskFactor2.reduce((acc, curr) => acc + curr.value * curr.weight, 0) / _riskFactor2.reduce((acc, curr) => acc + curr.weight, 0),
       notARisks: getNoRiskTags(_riskFactor2)
     },
+    apyMethodology: "APY based on 7-day historical performance, including fees and rewards.",
     additionalInfo: {
       newBounds: {
         lower: -1,
         upper: 1
       },
-      lstContract: ContractAddr.from("0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a")
+      lstContract: ContractAddr.from("0x028d709c875c0ceac3dce7065bec5328186dc89fe254527084d1689910954b0a"),
+      feeBps: 1e3
     }
   }];
   return __toCommonJS(index_browser_exports);