@strkfarm/sdk 1.1.17 → 1.1.19

package/src/strategies/universal-strategy.tsx

@@ -10,7 +10,7 @@ import ManagerAbi from '../data/vault-manager.abi.json';
 import { ApproveCallParams, AvnuSwapCallParams, BaseAdapter, CommonAdapter, FlashloanCallParams, GenerateCallFn, LeafAdapterFn, ManageCall, VesuAdapter, VesuDefiSpringRewardsCallParams, VesuModifyPositionCallParams, VesuPools } from "./universal-adapters";
 import { Global } from "@/global";
 import { AvnuWrapper, ERC20 } from "@/modules";
-import { AVNU_MIDDLEWARE } from "./universal-adapters/adapter-utils";
+import { AVNU_MIDDLEWARE, VESU_SINGLETON } from "./universal-adapters/adapter-utils";
 import { VesuHarvests } from "@/modules/harvests";
 
 export interface UniversalManageCall {
@@ -229,12 +229,12 @@ export class UniversalStrategy<
     const rewardAPYs: number[] = [];
     for (const [index, pool] of pools.entries()) {
       const vesuAdapter = vesuAdapters[index];
-      const collateralAsset = pool.assets.find((a: any) => a.symbol === vesuAdapter.config.collateral.symbol)?.stats!;
-      const debtAsset = pool.assets.find((a: any) => a.symbol === vesuAdapter.config.debt.symbol)?.stats!;
+      const collateralAsset = pool.assets.find((a: any) => a.symbol.toLowerCase() === vesuAdapter.config.collateral.symbol.toLowerCase())?.stats!;
+      const debtAsset = pool.assets.find((a: any) => a.symbol.toLowerCase() === vesuAdapter.config.debt.symbol.toLowerCase())?.stats!;
       const supplyApy = Number(collateralAsset.supplyApy.value || 0) / 1e18;
       const lstAPY = Number(collateralAsset.lstApr?.value || 0) / 1e18;
       baseAPYs.push(...[supplyApy + lstAPY, Number(debtAsset.borrowApr.value) / 1e18]);
-      rewardAPYs.push(...[Number(collateralAsset.defiSpringSupplyApr.value || "0") / 1e18, 0]);
+      rewardAPYs.push(...[Number(collateralAsset.defiSpringSupplyApr?.value || "0") / 1e18, 0]);
     }
     logger.verbose(`${this.metadata.name}::netAPY: baseAPYs: ${JSON.stringify(baseAPYs)}`);
     logger.verbose(`${this.metadata.name}::netAPY: rewardAPYs: ${JSON.stringify(rewardAPYs)}`);
@@ -311,6 +311,7 @@ export class UniversalStrategy<
     let vesuAum = Web3Number.fromWei("0", underlying.decimals);
     
     let tokenUnderlyingPrice = await this.pricer.getPrice(this.asset().symbol);
+    logger.verbose(`${this.getTag()} tokenUnderlyingPrice: ${tokenUnderlyingPrice.price}`);
     
     // handle collateral
     if (legAUM[0].token.address.eq(underlying.address)) {
@@ -339,7 +340,6 @@ export class UniversalStrategy<
 
   async getAUM(): Promise<{net: SingleTokenInfo, prevAum: Web3Number, splits: {id: string, aum: Web3Number}[]}> {
     const prevAum = await this.getPrevAUM();
-
     const token1Price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
 
     // calculate vesu aum
@@ -437,7 +437,7 @@ export class UniversalStrategy<
       amount: unusedBalance.amount,
       usdValue: unusedBalance.usdValue,
       token: this.asset(),
-      remarks: "Unused Balance"
+      remarks: "Unused Balance (may not include recent deposits)"
     }];
   }
 
@@ -848,8 +848,8 @@ function getLooperSettings(
   vaultSettings.leafAdapters.push(commonAdapter.getFlashloanAdapter.bind(commonAdapter));
   vaultSettings.leafAdapters.push(vesuAdapterUSDCETH.getModifyPosition.bind(vesuAdapterUSDCETH));
   vaultSettings.leafAdapters.push(vesuAdapterETHUSDC.getModifyPosition.bind(vesuAdapterETHUSDC));
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(USDCToken.address, vesuAdapterUSDCETH.VESU_SINGLETON, UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1).bind(commonAdapter));
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(ETHToken.address, vesuAdapterETHUSDC.VESU_SINGLETON, UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN2).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(USDCToken.address, VESU_SINGLETON, UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(ETHToken.address, VESU_SINGLETON, UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN2).bind(commonAdapter));
   
   // to bridge liquidity back to vault (used by bring_liquidity)
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(USDCToken.address, vaultSettings.vaultAddress, UNIVERSAL_MANAGE_IDS.APPROVE_BRING_LIQUIDITY).bind(commonAdapter));