@strkfarm/sdk 1.2.0 → 2.0.0-dev-strategy2.1

package/src/strategies/vesu-rebalance.tsx

@@ -17,15 +17,15 @@ import VesuRebalanceAbi from "@/data/vesu-rebalance.abi.json";
 import { Global } from "@/global";
 import { assert } from "@/utils";
 import { logger } from "@/utils/logger";
-import axios from "axios";
 import { PricerBase } from "@/modules/pricerBase";
 import {
+  APYInfo,
   BaseStrategy,
   SingleActionAmount,
   SingleTokenInfo
 } from "./base-strategy";
 import { getAPIUsingHeadlessBrowser } from "@/node/headless";
-import { HarvestInfo, VesuHarvests } from "@/modules/harvests";
+import { VESU_REWARDS_ENDPOINT, VesuHarvests } from "@/modules/harvests";
 import VesuPoolIDs from "@/data/vesu_pools.json";
 import { COMMON_CONTRACTS, ENDPOINTS } from "./constants";
 
@@ -182,7 +182,7 @@ export class VesuRebalance extends BaseStrategy<
    * @returns Object containing the amount in token units and USD value
    */
   async getUserTVL(user: ContractAddr) {
-    const shares = await this.contract.balanceOf(user.address);
+    const shares = await this.contract.balance_of(user.address);
     const assets = await this.contract.convert_to_assets(
       uint256.bnToUint256(shares)
     );
@@ -288,7 +288,7 @@ export class VesuRebalance extends BaseStrategy<
       address: p.v_token.address,
       providerOrAccount: this.config.provider
     });
-    const bal = await vTokenContract.balanceOf(this.address.address);
+    const bal = await vTokenContract.balance_of(this.address.address);
     const assets = await vTokenContract.convert_to_assets(
       uint256.bnToUint256(bal.toString())
     );
@@ -523,9 +523,12 @@ export class VesuRebalance extends BaseStrategy<
    * Calculates the weighted average APY across all pools based on USD value.
    * @returns {Promise<number>} The weighted average APY across all pools
    */
-  async netAPY(): Promise<number> {
+  async netAPY(): Promise<APYInfo > {
     const { data: pools } = await this.getPools();
-    return this.netAPYGivenPools(pools);
+    return {
+      net: await this.netAPYGivenPools(pools),
+      splits: []
+    };
   }
 
   /**
@@ -763,17 +766,10 @@ export class VesuRebalance extends BaseStrategy<
     return [baseFlow];
   }
 
-  async getPendingRewards(): Promise<HarvestInfo[]> {
-    const vesuHarvests = new VesuHarvests(this.config);
-    return await vesuHarvests.getUnHarvestedRewards(this.address);
-  }
-
-  async harvest(acc: Account) {
-    const pendingRewards = await this.getPendingRewards();
-    if (pendingRewards.length == 0) {
-      throw new Error(`No pending rewards found`);
-    }
-    const harvest = pendingRewards[0];
+  async harvest(acc: Account, endpoint = VESU_REWARDS_ENDPOINT) {
+    const vesuHarvest = new VesuHarvests(this.config);
+    const harvests = await vesuHarvest.getUnHarvestedRewards(this.address, endpoint);
+    const harvest = harvests[0];
     const avnu = new AvnuWrapper();
     let swapInfo: SwapInfo = {
       token_from_address: harvest.token.address,
@@ -1014,8 +1010,8 @@ export const VesuRebalanceStrategies: IStrategyMetadata<VesuRebalanceSettings>[]
       investmentSteps: []
     },
     {
-      name: "Vesu Fusion USDC.e",
-      description: _description.replace("{{TOKEN}}", "USDC.e"),
+      name: "Vesu Fusion USDC",
+      description: _description.replace("{{TOKEN}}", "USDC"),
       address: ContractAddr.from(
         "0xa858c97e9454f407d1bd7c57472fc8d8d8449a777c822b41d18e387816f29c"
       ),
@@ -1023,7 +1019,7 @@ export const VesuRebalanceStrategies: IStrategyMetadata<VesuRebalanceSettings>[]
       type: "ERC4626",
       auditUrl: AUDIT_URL,
       depositTokens: [
-        Global.getDefaultTokens().find((t) => t.symbol === "USDC.e")!
+        Global.getDefaultTokens().find((t) => t.symbol === "USDC")!
       ],
       protocols: [_protocol],
       maxTVL: Web3Number.fromWei("0", 6),

package/src/utils/health-factor-math.ts

@@ -1,5 +1,6 @@
 import { Web3Number } from "@/dataTypes";
 import { TokenInfo } from "@/interfaces";
+import { logger } from "@/utils/logger";
 
 export class HealthFactorMath {
   static getCollateralRequired(
@@ -52,13 +53,18 @@ export class HealthFactorMath {
     debtTokenInfo: TokenInfo
   ) {
     // lets say debt usd value is X
-    // HF = ((1 * cp) + X) * maxLTV / (X)
-    // => X * HF = ((1 * cp) + X) * maxLTV
-    // => X * (HF - maxLTV) = 1 * cp * maxLTV
-    // => X = 1 * cp * maxLTV / (HF - maxLTV)
+    // HF = ((ca * cp) + X) * maxLTV / (X)
+    // => X * HF = ((ca * cp) + X) * maxLTV
+    // => X * (HF - maxLTV) = ca * cp * maxLTV
+    // => X = ca * cp * maxLTV / (HF - maxLTV)
     const numerator = collateralAmount.multipliedBy(collateralPrice).multipliedBy(maxLTV);
+    logger.verbose(`HealthFactorMath: Max debt amount on looping numerator: ${numerator.toNumber()}, collateralAmount: ${collateralAmount.toNumber()}, collateralPrice: ${collateralPrice}, maxLTV: ${maxLTV}, targetHF: ${targetHF}, debtPrice: ${debtPrice}`);
     const denominator = targetHF - maxLTV;
-    const debtAmount = numerator.dividedBy(denominator);
+    logger.verbose(`HealthFactorMath: Max debt amount on looping denominator: ${denominator}`);
+    const debtAmountUSD = numerator.dividedBy(denominator);
+    logger.verbose(`HealthFactorMath: Max debt amount on looping debtAmountUSD: ${debtAmountUSD.toNumber()}`);
+    const debtAmount = debtAmountUSD.dividedBy(debtPrice);
+    logger.verbose(`HealthFactorMath: Max debt amount on looping debtAmount: ${debtAmount.toNumber()}`);
     return new Web3Number(debtAmount.toString(), debtTokenInfo.decimals);
   }