@strkfarm/sdk 1.1.70 → 2.0.0-dev.1

package/src/strategies/universal-strategy.tsx

@@ -7,11 +7,11 @@ import { VesuRebalanceSettings } from "./vesu-rebalance";
 import { assert, LeafData, logger, StandardMerkleTree } from "@/utils";
 import UniversalVaultAbi from '../data/universal-vault.abi.json';
 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 { ApproveCallParams, AvnuSwapCallParams, BaseAdapter, CommonAdapter, DepositParams, FlashloanCallParams, GenerateCallFn, LeafAdapterFn, ManageCall, WithdrawParams } from "./universal-adapters";
 import { Global } from "@/global";
 import { AvnuWrapper, ERC20 } from "@/modules";
 import { AVNU_MIDDLEWARE, VESU_SINGLETON } from "./universal-adapters/adapter-utils";
-import { HarvestInfo, VesuHarvests } from "@/modules/harvests";
+import { VesuHarvests } from "@/modules/harvests";
 
 export interface UniversalManageCall {
   proofs: string[];
@@ -24,16 +24,13 @@ export interface UniversalStrategySettings {
   manager: ContractAddr,
   vaultAllocator: ContractAddr,
   redeemRequestNFT: ContractAddr,
-  aumOracle: ContractAddr,
 
   // Individual merkle tree leaves
   leafAdapters: LeafAdapterFn<any>[],
 
   // Useful for returning adapter class objects that can compute
   // certain things for us (e.g. positions, hfs)
-  adapters: {id: string, adapter: BaseAdapter}[],
-  targetHealthFactor: number,
-  minHealthFactor: number
+  adapters: {id: string, adapter: BaseAdapter<DepositParams, WithdrawParams>}[]
 }
 
 export enum AUMTypes {
@@ -41,787 +38,705 @@ export enum AUMTypes {
   DEFISPRING = 'defispring'
 }
 
-export class UniversalStrategy<
-  S extends UniversalStrategySettings
-> extends BaseStrategy<
-  SingleTokenInfo,
-  SingleActionAmount
-> {
-
-  /** Contract address of the strategy */
-  readonly address: ContractAddr;
-  /** Pricer instance for token price calculations */
-  readonly pricer: PricerBase;
-  /** Metadata containing strategy information */
-  readonly metadata: IStrategyMetadata<S>;
-  /** Contract instance for interacting with the strategy */
-  readonly contract: Contract;
-  readonly managerContract: Contract;
-  merkleTree: StandardMerkleTree | undefined;
-
-  constructor(
-      config: IConfig,
-      pricer: PricerBase,
-      metadata: IStrategyMetadata<S>
-    ) {
-      super(config);
-      this.pricer = pricer;
+// export class UniversalStrategy<
+//   S extends UniversalStrategySettings
+// > extends BaseStrategy<
+//   SingleTokenInfo,
+//   SingleActionAmount
+// > {
+
+//   /** Contract address of the strategy */
+//   readonly address: ContractAddr;
+//   /** Pricer instance for token price calculations */
+//   readonly pricer: PricerBase;
+//   /** Metadata containing strategy information */
+//   readonly metadata: IStrategyMetadata<S>;
+//   /** Contract instance for interacting with the strategy */
+//   readonly contract: Contract;
+//   readonly managerContract: Contract;
+//   merkleTree: StandardMerkleTree | undefined;
+
+//   constructor(
+//       config: IConfig,
+//       pricer: PricerBase,
+//       metadata: IStrategyMetadata<S>
+//     ) {
+//       super(config);
+//       this.pricer = pricer;
   
-      assert(
-        metadata.depositTokens.length === 1,
-        "VesuRebalance only supports 1 deposit token"
-      );
-      this.metadata = metadata;
-      this.address = metadata.address;
+//       assert(
+//         metadata.depositTokens.length === 1,
+//         "VesuRebalance only supports 1 deposit token"
+//       );
+//       this.metadata = metadata;
+//       this.address = metadata.address;
   
-      this.contract = new Contract({
-        abi: UniversalVaultAbi,
-        address: this.address.address,
-        providerOrAccount: this.config.provider
-      });
-      this.managerContract = new Contract({
-        abi: ManagerAbi,
-        address: this.metadata.additionalInfo.manager.address,
-        providerOrAccount: this.config.provider
-      });
-  }
-
-  getMerkleTree() {
-    if (this.merkleTree) return this.merkleTree;
-    const leaves = this.metadata.additionalInfo.leafAdapters.map((adapter, index) => {
-      return adapter()
-    });
-    const standardTree = StandardMerkleTree.of(leaves.map(l => l.leaf));
-    this.merkleTree = standardTree;
-    return standardTree;
-  }
-
-  getMerkleRoot() {
-    return this.getMerkleTree().root;
-  }
-
-  getProofs<T>(id: string): { proofs: string[], callConstructor: GenerateCallFn<T> } {
-    const tree = this.getMerkleTree();
-    let proofs: string[] = [];
-    for (const [i, v] of tree.entries()) {
-      if (v.readableId == id) {
-        proofs = tree.getProof(i);
-      }
-    }
-    if (proofs.length === 0) {
-      throw new Error(`Proof not found for ID: ${id}`);
-    }
-
-    // find leaf adapter
-    const leafAdapter = this.metadata.additionalInfo.leafAdapters.find(adapter => adapter().leaf.readableId === id);
-    if (!leafAdapter) {
-      throw new Error(`Leaf adapter not found for ID: ${id}`);
-    }
-    const leafInfo = leafAdapter();
-    return {
-      proofs,
-      callConstructor: leafInfo.callConstructor.bind(leafInfo),
-    };
-  }
-
-  getAdapter(id: string): BaseAdapter {
-    const adapter = this.metadata.additionalInfo.adapters.find(adapter => adapter.id === id);
-    if (!adapter) {
-      throw new Error(`Adapter not found for ID: ${id}`);
-    }
-    return adapter.adapter;
-  }
-
-  asset() {
-    return this.metadata.depositTokens[0];
-  }
-
-  async depositCall(amountInfo: SingleActionAmount, receiver: ContractAddr): Promise<Call[]> {
-    // Technically its not erc4626 abi, but we just need approve call
-    // so, its ok to use it
-    assert(
-      amountInfo.tokenInfo.address.eq(this.asset().address),
-      "Deposit token mismatch"
-    );
-    const assetContract = new Contract({
-      abi: UniversalVaultAbi,
-      address: this.asset().address.address,
-      providerOrAccount: this.config.provider
-    });
-    const call1 = assetContract.populate("approve", [
-      this.address.address,
-      uint256.bnToUint256(amountInfo.amount.toWei())
-    ]);
-    const call2 = this.contract.populate("deposit", [
-      uint256.bnToUint256(amountInfo.amount.toWei()),
-      receiver.address
-    ]);
-    return [call1, call2];
-  }
-
-  async withdrawCall(amountInfo: SingleActionAmount, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]> {
-    assert(
-      amountInfo.tokenInfo.address.eq(this.asset().address),
-      "Withdraw token mismatch"
-    );
-    const shares = await this.contract.call('convert_to_shares', [uint256.bnToUint256(amountInfo.amount.toWei())]);
-    const call = this.contract.populate("request_redeem", [
-      uint256.bnToUint256(shares.toString()),
-      receiver.address,
-      owner.address
-    ]);
-    return [call];
-  }
-
-  /**
-   * Calculates the Total Value Locked (TVL) for a specific user.
-   * @param user - Address of the user
-   * @returns Object containing the amount in token units and USD value
-   */
-  async getUserTVL(user: ContractAddr) {
-    const shares = await this.contract.balanceOf(user.address);
-    const assets = await this.contract.convert_to_assets(
-      uint256.bnToUint256(shares)
-    );
-    const amount = Web3Number.fromWei(
-      assets.toString(),
-      this.metadata.depositTokens[0].decimals
-    );
-    let price = await this.pricer.getPrice(
-      this.metadata.depositTokens[0].symbol
-    );
-    const usdValue = Number(amount.toFixed(6)) * price.price;
-    return {
-      tokenInfo: this.asset(),
-      amount,
-      usdValue
-    };
-  }
-
-  async getVesuAPYs() {
-    // get Vesu pools, positions and APYs
-    const vesuAdapters = this.getVesuAdapters();
-    const allVesuPools = await VesuAdapter.getVesuPools();
-    const pools = vesuAdapters.map((vesuAdapter) => {
-      return allVesuPools.pools.find(p => vesuAdapter.config.poolId.eqString(num.getHexString(p.id)));
-    });
-    logger.verbose(`${this.metadata.name}::netAPY: vesu-pools: ${JSON.stringify(pools)}`);
-    if (pools.some(p => !p)) {
-      throw new Error('Pool not found');
-    };
-    const positions = await this.getVesuPositions();
-    logger.verbose(`${this.metadata.name}::netAPY: positions: ${JSON.stringify(positions)}`);
-    const baseAPYs: number[] = [];
-    const rewardAPYs: number[] = [];
-    
-    
-    for (const [index, pool] of pools.entries()) {
-      const vesuAdapter = vesuAdapters[index];
-      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;
-      
-      // Use LST APR from Endur API instead of Vesu's lstApr
-      const lstAPY = await this.getLSTAPR(vesuAdapter.config.collateral.address);
-      logger.verbose(`${this.metadata.name}::netAPY: ${vesuAdapter.config.collateral.symbol} LST APR from Endur: ${lstAPY}`);
-      
-      baseAPYs.push(...[supplyApy + lstAPY, Number(debtAsset.borrowApr.value) / 1e18]);
-      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)}`);
-
-    // Else further compute will fail
-    assert(baseAPYs.length == positions.length, 'APYs and positions length mismatch');
-    
-    return {
-      baseAPYs,
-      rewardAPYs,
-      positions
-    }
-  }
-
-  /**
-   * 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<{ net: number, splits: { apy: number, id: string }[] }> {
-    if (this.metadata.isPreview) {
-      return { net: 0, splits: [{
-        apy: 0, id: 'base'
-      }, {
-        apy: 0, id: 'defispring'
-      }] };
-    }
-    
-    const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
-
-    const unusedBalanceAPY = await this.getUnusedBalanceAPY();
-    baseAPYs.push(...[unusedBalanceAPY.apy]);
-    rewardAPYs.push(0);
-
-    // Compute APy using weights
-    const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
-    weights.push(unusedBalanceAPY.weight);
-
-    const prevAUM = await this.getPrevAUM();
-    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-    const prevAUMUSD = prevAUM.multipliedBy(price.price);
-    return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
-  }
-
-  protected async returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[], prevAUMUSD: Web3Number) {
-    // If no positions, return 0
-    if (weights.every(p => p == 0)) {
-      return { net: 0, splits: [{
-        apy: 0, id: 'base'
-      }, {
-        apy: 0, id: 'defispring'
-      }]};
-    }
-
-    const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
-    const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
-    const netAPY = baseAPY + rewardAPY;
-    logger.verbose(`${this.metadata.name}::netAPY: net: ${netAPY}, baseAPY: ${baseAPY}, rewardAPY: ${rewardAPY}`);
-    return { net: netAPY, splits: [{
-      apy: baseAPY, id: 'base'
-    }, {
-      apy: rewardAPY, id: 'defispring'
-    }] };
-  }
-
-  protected async getUnusedBalanceAPY() {
-    return {
-      apy: 0, weight: 0
-    }
-  }
-
-  private computeAPY(apys: number[], weights: number[], currentAUM: Web3Number) {
-    assert(apys.length === weights.length, "APYs and weights length mismatch");
-    const weightedSum = apys.reduce((acc, apy, i) => acc + apy * weights[i], 0);
-    logger.verbose(`${this.getTag()} computeAPY: apys: ${JSON.stringify(apys)}, weights: ${JSON.stringify(weights)}, weightedSum: ${weightedSum}, currentAUM: ${currentAUM}`);
-    return weightedSum / currentAUM.toNumber();
-  }
-
-  /**
-     * Calculates the total TVL of the strategy.
-     * @returns Object containing the total amount in token units and USD value
-  */
-  async getTVL() {
-    const assets = await this.contract.total_assets();
-    const amount = Web3Number.fromWei(
-      assets.toString(),
-      this.metadata.depositTokens[0].decimals
-    );
-    let price = await this.pricer.getPrice(
-      this.metadata.depositTokens[0].symbol
-    );
-    const usdValue = Number(amount.toFixed(6)) * price.price;
-    return {
-      tokenInfo: this.asset(),
-      amount,
-      usdValue
-    };
-  }
-
-  async getUnusedBalance(): Promise<SingleTokenInfo> {
-    const balance = await (new ERC20(this.config)).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
-    const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
-    const usdValue = Number(balance.toFixed(6)) * price.price;
-    return {
-      tokenInfo: this.asset(),
-      amount: balance,
-      usdValue
-    };
-  }
-
-  protected async getVesuAUM(adapter: VesuAdapter) {
-    const legAUM = await adapter.getPositions(this.config);
-    const underlying = this.asset();
-    let vesuAum = Web3Number.fromWei("0", underlying.decimals);
+//       this.contract = new Contract({
+//         abi: UniversalVaultAbi,
+//         address: this.address.address,
+//         providerOrAccount: this.config.provider
+//       });
+//       this.managerContract = new Contract({
+//         abi: ManagerAbi,
+//         address: this.metadata.additionalInfo.manager.address,
+//         providerOrAccount: this.config.provider
+//       });
+//   }
+
+//   getAllLeaves() {
+//     const leaves = this.metadata.additionalInfo.leafAdapters.map((adapter, index) => {
+//       return adapter()
+//     });
+//     const _leaves: LeafData[] = [];
+//     leaves.forEach((_l) => {
+//       _leaves.push(..._l.leaves);
+//     })
+//     return _leaves;
+
+//   }
+//   getMerkleTree() {
+//     if (this.merkleTree) return this.merkleTree;
+//     const _leaves = this.getAllLeaves();
+
+//     const standardTree = StandardMerkleTree.of(_leaves);
+//     this.merkleTree = standardTree;
+//     return standardTree;
+//   }
+
+//   getMerkleRoot() {
+//     return this.getMerkleTree().root;
+//   }
+
+//   getAdapter(id: string): BaseAdapter<DepositParams, WithdrawParams> {
+//     const adapter = this.metadata.additionalInfo.adapters.find(adapter => adapter.id === id);
+//     if (!adapter) {
+//       throw new Error(`Adapter not found for ID: ${id}`);
+//     }
+//     return adapter.adapter;
+//   }
+
+//   asset() {
+//     return this.metadata.depositTokens[0];
+//   }
+
+//   async depositCall(amountInfo: SingleActionAmount, receiver: ContractAddr): Promise<Call[]> {
+//     // Technically its not erc4626 abi, but we just need approve call
+//     // so, its ok to use it
+//     assert(
+//       amountInfo.tokenInfo.address.eq(this.asset().address),
+//       "Deposit token mismatch"
+//     );
+//     const assetContract = new Contract({
+//       abi: UniversalVaultAbi,
+//       address: this.asset().address.address,
+//       providerOrAccount: this.config.provider
+//     });
+//     const call1 = assetContract.populate("approve", [
+//       this.address.address,
+//       uint256.bnToUint256(amountInfo.amount.toWei())
+//     ]);
+//     const call2 = this.contract.populate("deposit", [
+//       uint256.bnToUint256(amountInfo.amount.toWei()),
+//       receiver.address
+//     ]);
+//     return [call1, call2];
+//   }
+
+//   async withdrawCall(amountInfo: SingleActionAmount, receiver: ContractAddr, owner: ContractAddr): Promise<Call[]> {
+//     assert(
+//       amountInfo.tokenInfo.address.eq(this.asset().address),
+//       "Withdraw token mismatch"
+//     );
+//     const shares = await this.contract.call('convert_to_shares', [uint256.bnToUint256(amountInfo.amount.toWei())]);
+//     const call = this.contract.populate("request_redeem", [
+//       uint256.bnToUint256(shares.toString()),
+//       receiver.address,
+//       owner.address
+//     ]);
+//     return [call];
+//   }
+
+//   /**
+//    * Calculates the Total Value Locked (TVL) for a specific user.
+//    * @param user - Address of the user
+//    * @returns Object containing the amount in token units and USD value
+//    */
+//   async getUserTVL(user: ContractAddr) {
+//     const shares = await this.contract.balance_of(user.address);
+//     const assets = await this.contract.convert_to_assets(
+//       uint256.bnToUint256(shares)
+//     );
+//     const amount = Web3Number.fromWei(
+//       assets.toString(),
+//       this.metadata.depositTokens[0].decimals
+//     );
+//     let price = await this.pricer.getPrice(
+//       this.metadata.depositTokens[0].symbol
+//     );
+//     const usdValue = Number(amount.toFixed(6)) * price.price;
+//     return {
+//       tokenInfo: this.asset(),
+//       amount,
+//       usdValue
+//     };
+//   }
+
+//   /**
+//    * 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<{ net: number, splits: { apy: number, id: string }[] }> {
+//     if (this.metadata.isPreview) {
+//       return { net: 0, splits: [{
+//         apy: 0, id: 'base'
+//       }, {
+//         apy: 0, id: 'defispring'
+//       }] };
+//     }
     
-    let tokenUnderlyingPrice = await this.pricer.getPrice(this.asset().symbol);
-    logger.verbose(`${this.getTag()} tokenUnderlyingPrice: ${tokenUnderlyingPrice.price}`);
+//     const { positions, baseAPYs, rewardAPYs } = await this.getVesuAPYs();
+
+//     const unusedBalanceAPY = await this.getUnusedBalanceAPY();
+//     baseAPYs.push(...[unusedBalanceAPY.apy]);
+//     rewardAPYs.push(0);
+
+//     // Compute APy using weights
+//     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
+//     weights.push(unusedBalanceAPY.weight);
+
+//     const prevAUM = await this.getPrevAUM();
+//     const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+//     const prevAUMUSD = prevAUM.multipliedBy(price.price);
+//     return this.returnNetAPY(baseAPYs, rewardAPYs, weights, prevAUMUSD);
+//   }
+
+//   protected async returnNetAPY(baseAPYs: number[], rewardAPYs: number[], weights: number[], prevAUMUSD: Web3Number) {
+//     // If no positions, return 0
+//     if (weights.every(p => p == 0)) {
+//       return { net: 0, splits: [{
+//         apy: 0, id: 'base'
+//       }, {
+//         apy: 0, id: 'defispring'
+//       }]};
+//     }
+
+//     const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
+//     const rewardAPY = this.computeAPY(rewardAPYs, weights, prevAUMUSD);
+//     const netAPY = baseAPY + rewardAPY;
+//     logger.verbose(`${this.metadata.name}::netAPY: net: ${netAPY}, baseAPY: ${baseAPY}, rewardAPY: ${rewardAPY}`);
+//     return { net: netAPY, splits: [{
+//       apy: baseAPY, id: 'base'
+//     }, {
+//       apy: rewardAPY, id: 'defispring'
+//     }] };
+//   }
+
+//   protected async getUnusedBalanceAPY() {
+//     return {
+//       apy: 0, weight: 0
+//     }
+//   }
+
+//   private computeAPY(apys: number[], weights: number[], currentAUM: Web3Number) {
+//     assert(apys.length === weights.length, "APYs and weights length mismatch");
+//     const weightedSum = apys.reduce((acc, apy, i) => acc + apy * weights[i], 0);
+//     logger.verbose(`${this.getTag()} computeAPY: apys: ${JSON.stringify(apys)}, weights: ${JSON.stringify(weights)}, weightedSum: ${weightedSum}, currentAUM: ${currentAUM}`);
+//     return weightedSum / currentAUM.toNumber();
+//   }
+
+//   /**
+//      * Calculates the total TVL of the strategy.
+//      * @returns Object containing the total amount in token units and USD value
+//   */
+//   async getTVL() {
+//     const assets = await this.contract.total_assets();
+//     const amount = Web3Number.fromWei(
+//       assets.toString(),
+//       this.metadata.depositTokens[0].decimals
+//     );
+//     let price = await this.pricer.getPrice(
+//       this.metadata.depositTokens[0].symbol
+//     );
+//     const usdValue = Number(amount.toFixed(6)) * price.price;
+//     return {
+//       tokenInfo: this.asset(),
+//       amount,
+//       usdValue
+//     };
+//   }
+
+//   async getUnusedBalance(): Promise<SingleTokenInfo> {
+//     const balance = await (new ERC20(this.config)).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
+//     const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
+//     const usdValue = Number(balance.toFixed(6)) * price.price;
+//     return {
+//       tokenInfo: this.asset(),
+//       amount: balance,
+//       usdValue
+//     };
+//   }
+
+//   protected async getVesuAUM(adapter: VesuAdapter) {
+//     const legAUM = await adapter.getPositions(this.config);
+//     const underlying = this.asset();
+//     let vesuAum = Web3Number.fromWei("0", underlying.decimals);
     
-    // handle collateral
-    if (legAUM[0].token.address.eq(underlying.address)) {
-      vesuAum = vesuAum.plus(legAUM[0].amount);
-    } else {
-      vesuAum = vesuAum.plus(legAUM[0].usdValue / tokenUnderlyingPrice.price);
-    }
-
-    // handle debt
-    if (legAUM[1].token.address.eq(underlying.address)) {
-      vesuAum = vesuAum.minus(legAUM[1].amount);
-    } else {
-      vesuAum = vesuAum.minus(legAUM[1].usdValue / tokenUnderlyingPrice.price);
-    };
-
-    logger.verbose(`${this.getTag()} Vesu AUM: ${vesuAum}, legCollateral: ${legAUM[0].amount.toNumber()}, legDebt: ${legAUM[1].amount.toNumber()}`);
-    return vesuAum;
-  }
-
-  async getPrevAUM() {
-    const currentAUM: bigint = await this.contract.call('aum', []) as bigint;
-    const prevAum = Web3Number.fromWei(currentAUM.toString(), this.asset().decimals);
-    logger.verbose(`${this.getTag()} Prev AUM: ${prevAum}`);
-    return prevAum;
-  }
-
-  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
-    const vesuAdapters = this.getVesuAdapters();
-    let vesuAum = Web3Number.fromWei("0", this.asset().decimals);
-    for (const adapter of vesuAdapters) {
-      vesuAum = vesuAum.plus(await this.getVesuAUM(adapter));
-    }
-
-    // account unused balance as aum as well (from vault allocator)
-    const balance = await this.getUnusedBalance();
-    logger.verbose(`${this.getTag()} unused balance: ${balance.amount.toNumber()}`);
-
-    // Initiate return values
-    const zeroAmt = Web3Number.fromWei('0', this.asset().decimals);
-    const net = {
-      tokenInfo: this.asset(),
-      amount: zeroAmt,
-      usdValue: 0
-    };
-    const aumToken = vesuAum.plus(balance.amount);
-    if (aumToken.isZero()) {
-      return { net, splits: [{
-        aum: zeroAmt, id: AUMTypes.FINALISED
-      }, {
-        aum: zeroAmt, id: AUMTypes.DEFISPRING
-      }], prevAum};
-    }
-    logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
-
-    // compute rewards contribution to AUM
-    const rewardAssets = await this.getRewardsAUM(prevAum);
-
-    // Sum up and return
-    const newAUM = aumToken.plus(rewardAssets);
-    logger.verbose(`${this.getTag()} New AUM: ${newAUM}`);
+//     let tokenUnderlyingPrice = await this.pricer.getPrice(this.asset().symbol);
+//     logger.verbose(`${this.getTag()} tokenUnderlyingPrice: ${tokenUnderlyingPrice.price}`);
     
-    net.amount = newAUM;
-    net.usdValue = newAUM.multipliedBy(token1Price.price).toNumber();
-    const splits = [{
-      id: AUMTypes.FINALISED,
-      aum: aumToken
-    }, {
-      id: AUMTypes.DEFISPRING,
-      aum: rewardAssets
-    }];
-    return { net, splits, prevAum };
-  }
-
-  // account for future rewards (e.g. defispring rewards)
-  protected async getRewardsAUM(prevAum: Web3Number) {
-    const lastReportTime = await this.contract.call('last_report_timestamp', []);
-    // - calculate estimated growth from strk rewards
-    const netAPY = await this.netAPY();
-    // account only 80% of value
-    const defispringAPY = (netAPY.splits.find(s => s.id === 'defispring')?.apy || 0) * 0.8;
-    // if (!defispringAPY) throw new Error('DefiSpring APY not found');
-
-    // compute rewards contribution to AUM
-    const timeDiff = (Math.round(Date.now() / 1000) - Number(lastReportTime));
-    const growthRate = timeDiff * defispringAPY / (365 * 24 * 60 * 60);
-    const rewardAssets = prevAum.multipliedBy(growthRate);
-    logger.verbose(`${this.getTag()} DefiSpring AUM time difference: ${timeDiff}`);
-    logger.verbose(`${this.getTag()} Current AUM: ${prevAum.toString()}`);
-    logger.verbose(`${this.getTag()} Net APY: ${JSON.stringify(netAPY)}`);
-    logger.verbose(`${this.getTag()} rewards AUM: ${rewardAssets}`);
-
-    return rewardAssets;
-  }
-
-  getVesuAdapters() {
-    const vesuAdapter1 = this.getAdapter(UNIVERSAL_ADAPTERS.VESU_LEG1) as VesuAdapter;
-    const vesuAdapter2 = this.getAdapter(UNIVERSAL_ADAPTERS.VESU_LEG2) as VesuAdapter;
-    vesuAdapter1.pricer = this.pricer;
-    vesuAdapter2.pricer = this.pricer;
-    vesuAdapter1.networkConfig = this.config;
-    vesuAdapter2.networkConfig = this.config;
+//     // handle collateral
+//     if (legAUM[0].token.address.eq(underlying.address)) {
+//       vesuAum = vesuAum.plus(legAUM[0].amount);
+//     } else {
+//       vesuAum = vesuAum.plus(legAUM[0].usdValue / tokenUnderlyingPrice.price);
+//     }
+
+//     // handle debt
+//     if (legAUM[1].token.address.eq(underlying.address)) {
+//       vesuAum = vesuAum.minus(legAUM[1].amount);
+//     } else {
+//       vesuAum = vesuAum.minus(legAUM[1].usdValue / tokenUnderlyingPrice.price);
+//     };
+
+//     logger.verbose(`${this.getTag()} Vesu AUM: ${vesuAum}, legCollateral: ${legAUM[0].amount.toNumber()}, legDebt: ${legAUM[1].amount.toNumber()}`);
+//     return vesuAum;
+//   }
+
+//   async getPrevAUM() {
+//     const currentAUM: bigint = await this.contract.call('aum', []) as bigint;
+//     const prevAum = Web3Number.fromWei(currentAUM.toString(), this.asset().decimals);
+//     logger.verbose(`${this.getTag()} Prev AUM: ${prevAum}`);
+//     return prevAum;
+//   }
+
+//   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
+//     const vesuAdapters = this.getVesuAdapters();
+//     let vesuAum = Web3Number.fromWei("0", this.asset().decimals);
+//     for (const adapter of vesuAdapters) {
+//       vesuAum = vesuAum.plus(await this.getVesuAUM(adapter));
+//     }
+
+//     // account unused balance as aum as well (from vault allocator)
+//     const balance = await this.getUnusedBalance();
+//     logger.verbose(`${this.getTag()} unused balance: ${balance.amount.toNumber()}`);
+
+//     // Initiate return values
+//     const zeroAmt = Web3Number.fromWei('0', this.asset().decimals);
+//     const net = {
+//       tokenInfo: this.asset(),
+//       amount: zeroAmt,
+//       usdValue: 0
+//     };
+//     const aumToken = vesuAum.plus(balance.amount);
+//     if (aumToken.isZero()) {
+//       return { net, splits: [{
+//         aum: zeroAmt, id: AUMTypes.FINALISED
+//       }, {
+//         aum: zeroAmt, id: AUMTypes.DEFISPRING
+//       }], prevAum};
+//     }
+//     logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
+
+//     // compute rewards contribution to AUM
+//     const rewardAssets = await this.getRewardsAUM(prevAum);
+
+//     // Sum up and return
+//     const newAUM = aumToken.plus(rewardAssets);
+//     logger.verbose(`${this.getTag()} New AUM: ${newAUM}`);
     
-    return [vesuAdapter1, vesuAdapter2];
-  }
-
-  async getVesuPositions(blockNumber: BlockIdentifier = 'latest'): Promise<VaultPosition[]> {
-    const adapters = this.getVesuAdapters();
-    const positions: VaultPosition[] = [];
-    for (const adapter of adapters) {
-      positions.push(...await adapter.getPositions(this.config, blockNumber));
-    }
-    return positions;
-  }
-
-  async getVaultPositions(): Promise<VaultPosition[]> {
-    const vesuPositions = await this.getVesuPositions();
-    const unusedBalance = await this.getUnusedBalance();
-    return [...vesuPositions, {
-      amount: unusedBalance.amount,
-      usdValue: unusedBalance.usdValue,
-      token: this.asset(),
-      remarks: "Unused Balance (may not include recent deposits)"
-    }];
-  }
-
-  getSetManagerCall(strategist: ContractAddr, root = this.getMerkleRoot()) {
-    return this.managerContract.populate('set_manage_root', [strategist.address, num.getHexString(root)]);
-  }
+//     net.amount = newAUM;
+//     net.usdValue = newAUM.multipliedBy(token1Price.price).toNumber();
+//     const splits = [{
+//       id: AUMTypes.FINALISED,
+//       aum: aumToken
+//     }, {
+//       id: AUMTypes.DEFISPRING,
+//       aum: rewardAssets
+//     }];
+//     return { net, splits, prevAum };
+//   }
+
+//   // account for future rewards (e.g. defispring rewards)
+//   protected async getRewardsAUM(prevAum: Web3Number) {
+//     const lastReportTime = await this.contract.call('last_report_timestamp', []);
+//     // - calculate estimated growth from strk rewards
+//     const netAPY = await this.netAPY();
+//     // account only 80% of value
+//     const defispringAPY = (netAPY.splits.find(s => s.id === 'defispring')?.apy || 0) * 0.8;
+//     if (!defispringAPY) throw new Error('DefiSpring APY not found');
+
+//     // compute rewards contribution to AUM
+//     const timeDiff = (Math.round(Date.now() / 1000) - Number(lastReportTime));
+//     const growthRate = timeDiff * defispringAPY / (365 * 24 * 60 * 60);
+//     const rewardAssets = prevAum.multipliedBy(growthRate);
+//     logger.verbose(`${this.getTag()} DefiSpring AUM time difference: ${timeDiff}`);
+//     logger.verbose(`${this.getTag()} Current AUM: ${prevAum.toString()}`);
+//     logger.verbose(`${this.getTag()} Net APY: ${JSON.stringify(netAPY)}`);
+//     logger.verbose(`${this.getTag()} rewards AUM: ${rewardAssets}`);
+
+//     return rewardAssets;
+//   }
+
+
+
+//   async getVaultPositions(): Promise<VaultPosition[]> {
+//     const vesuPositions = await this.getVesuPositions();
+//     const unusedBalance = await this.getUnusedBalance();
+//     return [...vesuPositions, {
+//       amount: unusedBalance.amount,
+//       usdValue: unusedBalance.usdValue,
+//       token: this.asset(),
+//       remarks: "Unused Balance (may not include recent deposits)"
+//     }];
+//   }
+
+//   getSetManagerCall(strategist: ContractAddr, root = this.getMerkleRoot()) {
+//     return this.managerContract.populate('set_manage_root', [strategist.address, num.getHexString(root)]);
+//   }
   
-  getManageCall(proofIds: string[], manageCalls: ManageCall[]) {
-    assert(proofIds.length == manageCalls.length, 'Proof IDs and Manage Calls length mismatch');
-    return this.managerContract.populate('manage_vault_with_merkle_verification', {
-        proofs: proofIds.map(id => this.getProofs(id).proofs),
-        decoder_and_sanitizers: manageCalls.map(call => call.sanitizer.address),
-        targets: manageCalls.map(call => call.call.contractAddress.address),
-        selectors: manageCalls.map(call => call.call.selector),
-        calldatas: manageCalls.map(call => call.call.calldata), // Calldata[]
-    });
-  }
+//   getManageCall(proofIds: string[], manageCalls: ManageCall[]) {
+//     assert(proofIds.length == manageCalls.length, 'Proof IDs and Manage Calls length mismatch');
+//     return this.managerContract.populate('manage_vault_with_merkle_verification', {
+//         proofs: proofIds.map(id => this.getProofs(id).proofs),
+//         decoder_and_sanitizers: manageCalls.map(call => call.sanitizer.address),
+//         targets: manageCalls.map(call => call.call.contractAddress.address),
+//         selectors: manageCalls.map(call => call.call.selector),
+//         calldatas: manageCalls.map(call => call.call.calldata), // Calldata[]
+//     });
+//   }
   
-  getVesuModifyPositionCalls(params: {
-    isLeg1: boolean,
-    isDeposit: boolean,
-    depositAmount: Web3Number,
-    debtAmount: Web3Number
-  }): UniversalManageCall[] {
-      assert(params.depositAmount.gt(0) || params.debtAmount.gt(0), 'Either deposit or debt amount must be greater than 0');
-      // approve token
-      const isToken1 = params.isLeg1 == params.isDeposit; // XOR
-      const STEP1_ID = isToken1 ? UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1 :UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN2;
-      const manage4Info = this.getProofs<ApproveCallParams>(STEP1_ID);
-      const approveAmount = params.isDeposit ? params.depositAmount : params.debtAmount;
-      const manageCall4 = manage4Info.callConstructor({
-          amount: approveAmount
-      })
-
-      // deposit and borrow or repay and withdraw
-      const STEP2_ID = params.isLeg1 ? UNIVERSAL_MANAGE_IDS.VESU_LEG1 : UNIVERSAL_MANAGE_IDS.VESU_LEG2;
-      const manage5Info = this.getProofs<VesuModifyPositionCallParams>(STEP2_ID);
-      const manageCall5 = manage5Info.callConstructor(VesuAdapter.getDefaultModifyPositionCallParams({
-          collateralAmount: params.depositAmount,
-          isAddCollateral: params.isDeposit,
-          debtAmount: params.debtAmount,
-          isBorrow: params.isDeposit
-      }))
-
-      const output = [{
-        proofs: manage5Info.proofs,
-        manageCall: manageCall5,
-        step: STEP2_ID
-      }];
-      if (approveAmount.gt(0)) {
-        output.unshift({
-          proofs: manage4Info.proofs,
-          manageCall: manageCall4,
-          step: STEP1_ID
-        })
-      }
-      return output;
-  }
-
-  getTag() {
-    return `${UniversalStrategy.name}:${this.metadata.name}`;
-  }
-
-  /**
-   * Gets LST APR for the strategy's underlying asset from Endur API
-   * @returns Promise<number> The LST APR (not divided by 1e18)
-   */
-  async getLSTAPR(address: ContractAddr): Promise<number> {
-    return 0;
-  }
-
-  async getVesuHealthFactors(blockNumber: BlockIdentifier = 'latest') {
-    return await Promise.all(this.getVesuAdapters().map(v => v.getHealthFactor(blockNumber)));
-  }
-
-  async computeRebalanceConditionAndReturnCalls(): Promise<Call[]> {
-    const vesuAdapters = this.getVesuAdapters();
-    const healthFactors = await this.getVesuHealthFactors();
-    const leg1HealthFactor = healthFactors[0];
-    const leg2HealthFactor = healthFactors[1];
-    logger.verbose(`${this.getTag()}: HealthFactorLeg1: ${leg1HealthFactor}`);
-    logger.verbose(`${this.getTag()}: HealthFactorLeg2: ${leg2HealthFactor}`);
-
-    const minHf = this.metadata.additionalInfo.minHealthFactor;
-    const isRebalanceNeeded1 = leg1HealthFactor < minHf;
-    const isRebalanceNeeded2 = leg2HealthFactor < minHf;
-    if (!isRebalanceNeeded1 && !isRebalanceNeeded2) {
-      return [];
-    }
+//   getVesuModifyPositionCalls(params: {
+//     isLeg1: boolean,
+//     isDeposit: boolean,
+//     depositAmount: Web3Number,
+//     debtAmount: Web3Number
+//   }): UniversalManageCall[] {
+//       assert(params.depositAmount.gt(0) || params.debtAmount.gt(0), 'Either deposit or debt amount must be greater than 0');
+//       // approve token
+//       const isToken1 = params.isLeg1 == params.isDeposit; // XOR
+//       const STEP1_ID = isToken1 ? UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN1 :UNIVERSAL_MANAGE_IDS.APPROVE_TOKEN2;
+//       const manage4Info = this.getProofs<ApproveCallParams>(STEP1_ID);
+//       const approveAmount = params.isDeposit ? params.depositAmount : params.debtAmount;
+//       const manageCall4 = manage4Info.callConstructor({
+//           amount: approveAmount
+//       })
+
+//       // deposit and borrow or repay and withdraw
+//       const STEP2_ID = params.isLeg1 ? UNIVERSAL_MANAGE_IDS.VESU_LEG1 : UNIVERSAL_MANAGE_IDS.VESU_LEG2;
+//       const manage5Info = this.getProofs<VesuModifyPositionCallParams>(STEP2_ID);
+//       const manageCall5 = manage5Info.callConstructor(VesuAdapter.getDefaultModifyPositionCallParams({
+//           collateralAmount: params.depositAmount,
+//           isAddCollateral: params.isDeposit,
+//           debtAmount: params.debtAmount,
+//           isBorrow: params.isDeposit
+//       }))
+
+//       const output = [{
+//         proofs: manage5Info.proofs,
+//         manageCall: manageCall5,
+//         step: STEP2_ID
+//       }];
+//       if (approveAmount.gt(0)) {
+//         output.unshift({
+//           proofs: manage4Info.proofs,
+//           manageCall: manageCall4,
+//           step: STEP1_ID
+//         })
+//       }
+//       return output;
+//   }
+
+//   getTag() {
+//     return `${UniversalStrategy.name}:${this.metadata.name}`;
+//   }
+
+//   /**
+//    * Gets LST APR for the strategy's underlying asset from Endur API
+//    * @returns Promise<number> The LST APR (not divided by 1e18)
+//    */
+//   async getLSTAPR(address: ContractAddr): Promise<number> {
+//     return 0;
+//   }
+
+//   async getVesuHealthFactors(blockNumber: BlockIdentifier = 'latest') {
+//     return await Promise.all(this.getVesuAdapters().map(v => v.getHealthFactor(blockNumber)));
+//   }
+
+//   async computeRebalanceConditionAndReturnCalls(): Promise<Call[]> {
+//     const vesuAdapters = this.getVesuAdapters();
+//     const healthFactors = await this.getVesuHealthFactors();
+//     const leg1HealthFactor = healthFactors[0];
+//     const leg2HealthFactor = healthFactors[1];
+//     logger.verbose(`${this.getTag()}: HealthFactorLeg1: ${leg1HealthFactor}`);
+//     logger.verbose(`${this.getTag()}: HealthFactorLeg2: ${leg2HealthFactor}`);
+
+//     const minHf = this.metadata.additionalInfo.minHealthFactor;
+//     const isRebalanceNeeded1 = leg1HealthFactor < minHf;
+//     const isRebalanceNeeded2 = leg2HealthFactor < minHf;
+//     if (!isRebalanceNeeded1 && !isRebalanceNeeded2) {
+//       return [];
+//     }
     
-    if (isRebalanceNeeded1) {
-      const amount = await this.getLegRebalanceAmount(vesuAdapters[0], leg1HealthFactor, false);
-      const leg2HF = await this.getNewHealthFactor(vesuAdapters[1], amount, true);
-      assert(leg2HF > minHf, `Rebalance Leg1 failed: Leg2 HF after rebalance would be too low: ${leg2HF}`);
-      return [await this.getRebalanceCall({
-        isLeg1toLeg2: false,
-        amount: amount
-      })];
-    } else {
-      const amount = await this.getLegRebalanceAmount(vesuAdapters[1], leg2HealthFactor, true);
-      const leg1HF = await this.getNewHealthFactor(vesuAdapters[0], amount, false);
-      assert(leg1HF > minHf, `Rebalance Leg2 failed: Leg1 HF after rebalance would be too low: ${leg1HF}`);
-      return [await this.getRebalanceCall({
-        isLeg1toLeg2: true,
-        amount: amount
-      })];
-    }
-  }
-
-  private async getNewHealthFactor(vesuAdapter: VesuAdapter, newAmount: Web3Number, isWithdraw: boolean) {
-    const {
-      collateralTokenAmount,
-      collateralUSDAmount,
-      collateralPrice,
-      debtTokenAmount,
-      debtUSDAmount,
-      debtPrice,
-      ltv
-    } = await vesuAdapter.getAssetPrices();
-
-    if (isWithdraw) {
-      const newHF = ((collateralTokenAmount.toNumber() - newAmount.toNumber()) * collateralPrice * ltv) / debtUSDAmount;
-      logger.verbose(`getNewHealthFactor:: HF: ${newHF}, amoutn: ${newAmount.toNumber()}, isDeposit`);
-      return newHF;
-    } else { // is borrow
-      const newHF = (collateralUSDAmount * ltv) / ((debtTokenAmount.toNumber() + newAmount.toNumber()) * debtPrice);
-      logger.verbose(`getNewHealthFactor:: HF: ${newHF}, amoutn: ${newAmount.toNumber()}, isRepay`);
-      return newHF;
-    }
-  }
-
-  /**
-   * 
-   * @param vesuAdapter 
-   * @param currentHf 
-   * @param isDeposit if true, attempt by adding collateral, else by repaying
-   * @returns 
-   */
-  private async getLegRebalanceAmount(vesuAdapter: VesuAdapter, currentHf: number, isDeposit: boolean) {
-    const {
-      collateralTokenAmount,
-      collateralUSDAmount,
-      collateralPrice,
-      debtTokenAmount,
-      debtUSDAmount,
-      debtPrice,
-      ltv
-    } = await vesuAdapter.getAssetPrices();
-
-    // debt is zero, nothing to rebalance
-    if(debtTokenAmount.isZero()) {
-      return Web3Number.fromWei(0, 0);
-    }
-
-    assert(collateralPrice > 0 && debtPrice > 0, "getRebalanceAmount: Invalid price");
-
-    // avoid calculating for too close
-    const targetHF = this.metadata.additionalInfo.targetHealthFactor;
-    if (currentHf > targetHF - 0.01) 
-      throw new Error("getLegRebalanceAmount: Current health factor is healthy");
-
-    if (isDeposit) {
-      // TargetHF = (collAmount + newAmount) * price * ltv / debtUSD
-      const newAmount = targetHF * debtUSDAmount / (collateralPrice * ltv) - collateralTokenAmount.toNumber();
-      logger.verbose(`${this.getTag()}:: getLegRebalanceAmount: addCollateral, currentHf: ${currentHf}, targetHF: ${targetHF}, collAmount: ${collateralTokenAmount.toString()}, collUSD: ${collateralUSDAmount}, collPrice: ${collateralPrice}, debtAmount: ${debtTokenAmount.toString()}, debtUSD: ${debtUSDAmount}, debtPrice: ${debtPrice}, ltv: ${ltv}, newAmount: ${newAmount}`);
-      return new Web3Number(newAmount.toFixed(8), collateralTokenAmount.decimals);
-    } else {
-      // TargetHF = collUSD * ltv / (debtAmount - newAmount) * debtPrice
-      const newAmount =  debtTokenAmount.toNumber() - collateralUSDAmount * ltv / (targetHF * debtPrice);
-      logger.verbose(`${this.getTag()}:: getLegRebalanceAmount: repayDebt, currentHf: ${currentHf}, targetHF: ${targetHF}, collAmount: ${collateralTokenAmount.toString()}, collUSD: ${collateralUSDAmount}, collPrice: ${collateralPrice}, debtAmount: ${debtTokenAmount.toString()}, debtUSD: ${debtUSDAmount}, debtPrice: ${debtPrice}, ltv: ${ltv}, newAmount: ${newAmount}`);
-      return new Web3Number(newAmount.toFixed(8), debtTokenAmount.decimals);
-    }
-  }
-
-  async getVesuModifyPositionCall(params: {
-    isDeposit: boolean,
-    leg1DepositAmount: Web3Number
-  }) {
-    const [vesuAdapter1, vesuAdapter2] = this.getVesuAdapters();
-    const leg1LTV = await vesuAdapter1.getLTVConfig(this.config);
-    const leg2LTV = await vesuAdapter2.getLTVConfig(this.config);
-    logger.verbose(`${this.getTag()}: LTVLeg1: ${leg1LTV}`);
-    logger.verbose(`${this.getTag()}: LTVLeg2: ${leg2LTV}`);
-
-    const token1Price = await this.pricer.getPrice(vesuAdapter1.config.collateral.symbol);
-    const token2Price = await this.pricer.getPrice(vesuAdapter2.config.collateral.symbol);
-    logger.verbose(`${this.getTag()}: Price${vesuAdapter1.config.collateral.symbol}: ${token1Price.price}`);
-    logger.verbose(`${this.getTag()}: Price${vesuAdapter2.config.collateral.symbol}: ${token2Price.price}`);
-
-    const TARGET_HF = this.metadata.additionalInfo.targetHealthFactor;
-
-    const k1 = token1Price.price * leg1LTV  / token2Price.price / TARGET_HF;
-    const k2 = token1Price.price * TARGET_HF / token2Price.price / leg2LTV;
-
-    const borrow2Amount = new Web3Number(
-      params.leg1DepositAmount.multipliedBy(k1.toFixed(6)).dividedBy(k2 - k1).toFixed(6),
-      vesuAdapter2.config.debt.decimals
-    );
-    const borrow1Amount = new Web3Number(
-      borrow2Amount.multipliedBy(k2).toFixed(6),
-      vesuAdapter1.config.debt.decimals
-    );
-    logger.verbose(`${this.getTag()}:: leg1DepositAmount: ${params.leg1DepositAmount.toString()} ${vesuAdapter1.config.collateral.symbol}`);
-    logger.verbose(`${this.getTag()}:: borrow1Amount: ${borrow1Amount.toString()} ${vesuAdapter1.config.debt.symbol}`);
-    logger.verbose(`${this.getTag()}:: borrow2Amount: ${borrow2Amount.toString()} ${vesuAdapter2.config.debt.symbol}`);
-
-    let callSet1 = this.getVesuModifyPositionCalls({
-      isLeg1: true,
-      isDeposit: params.isDeposit,
-      depositAmount: params.leg1DepositAmount.plus(borrow2Amount),
-      debtAmount: borrow1Amount
-    });
-
-    let callSet2 = this.getVesuModifyPositionCalls({
-      isLeg1: false,
-      isDeposit: params.isDeposit,
-      depositAmount: borrow1Amount,
-      debtAmount: borrow2Amount
-    });
-
-    if (!params.isDeposit) {
-      let temp = callSet2;
-      callSet2 = [...callSet1];
-      callSet1 = [...temp];
-    }
-    const allActions = [...callSet1.map(i => i.manageCall), ...callSet2.map(i => i.manageCall)];
-    const flashloanCalldata = CallData.compile([
-        [...callSet1.map(i => i.proofs), ...callSet2.map(i => i.proofs)],
-        allActions.map(i => i.sanitizer.address),
-        allActions.map(i => i.call.contractAddress.address),
-        allActions.map(i => i.call.selector),
-        allActions.map(i => i.call.calldata)
-    ])
-
-    // flash loan
-    const STEP1_ID = UNIVERSAL_MANAGE_IDS.FLASH_LOAN;
-    const manage1Info = this.getProofs<FlashloanCallParams>(STEP1_ID);
-    const manageCall1 = manage1Info.callConstructor({
-        amount: borrow2Amount,
-        data: flashloanCalldata.map(i => BigInt(i))
-    })
-    const manageCall = this.getManageCall([UNIVERSAL_MANAGE_IDS.FLASH_LOAN], [manageCall1]);
-    return manageCall;
-  }
-
-  async getBringLiquidityCall(params: {
-    amount: Web3Number
-  }) {
-    const manage1Info = this.getProofs<ApproveCallParams>(UNIVERSAL_MANAGE_IDS.APPROVE_BRING_LIQUIDITY);
-    const manageCall1 = manage1Info.callConstructor({
-        amount: params.amount
-    });
-    const manage2Info = this.getProofs<ApproveCallParams>(UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY);
-    const manageCall2 = manage2Info.callConstructor({
-        amount: params.amount
-    });
-    const manageCall = this.getManageCall([UNIVERSAL_MANAGE_IDS.APPROVE_BRING_LIQUIDITY, UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY], [manageCall1, manageCall2]);
-    return manageCall;
-  }
-
-  async getPendingRewards(): Promise<HarvestInfo[]> {
-    const vesuHarvest = new VesuHarvests(this.config);
-    return await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
-  }
-
-  async getHarvestCall() {
-    const harvestInfo = await this.getPendingRewards();
-    if (harvestInfo.length == 0) {
-      throw new Error(`No pending rewards found`);
-    }
-    if (harvestInfo.length != 1) {
-      throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
-    }
-
-    const amount = harvestInfo[0].claim.amount;
-    const actualReward = harvestInfo[0].actualReward;
-    const proofs = harvestInfo[0].proof;
-    if (actualReward.isZero()) {
-      throw new Error(`Expected non-zero actual reward, got ${harvestInfo[0].actualReward}`);
-    }
-
-    const manage1Info = this.getProofs<VesuDefiSpringRewardsCallParams>(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS);
-    const manageCall1 = manage1Info.callConstructor({
-        amount,
-        proofs
-    });
-    const proofIds: string[] = [UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS];
-    const manageCalls: ManageCall[] = [manageCall1];
-
-    // swap rewards for underlying
-    const STRK = Global.getDefaultTokens().find(t => t.symbol === 'STRK')!;
-    if (this.asset().symbol != 'STRK') {
-      // approve
-      const manage2Info = this.getProofs<ApproveCallParams>(UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1);
-      const manageCall2 = manage2Info.callConstructor({
-          amount: actualReward
-      });
-
-      // swap
-      const avnuModule = new AvnuWrapper();
-      const quote = await avnuModule.getQuotes(
-          STRK.address.address,
-          this.asset().address.address,
-          actualReward.toWei(),
-          this.address.address
-      );
-      const swapInfo = await avnuModule.getSwapInfo(quote, this.address.address, 0, this.address.address);
-      const manage3Info = this.getProofs<AvnuSwapCallParams>(UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS);
-      const manageCall3 = manage3Info.callConstructor({
-          props: swapInfo
-      });
-      proofIds.push(UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1);
-      proofIds.push(UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS);
-
-      manageCalls.push(manageCall2);
-      manageCalls.push(manageCall3);
-    }
-
-    const manageCall = this.getManageCall(proofIds, manageCalls);
-    return { call: manageCall, reward: actualReward, tokenInfo: STRK };
-  }
-
-  async getRebalanceCall(params: {
-    isLeg1toLeg2: boolean,
-    amount: Web3Number
-  }) {
-    let callSet1 = this.getVesuModifyPositionCalls({
-      isLeg1: true,
-      isDeposit: params.isLeg1toLeg2,
-      depositAmount: Web3Number.fromWei(0, 0),
-      debtAmount: params.amount
-    });
-
-    let callSet2 = this.getVesuModifyPositionCalls({
-      isLeg1: false,
-      isDeposit: params.isLeg1toLeg2,
-      depositAmount: params.amount,
-      debtAmount: Web3Number.fromWei(0, 0)
-    });
-
-    if (params.isLeg1toLeg2) {
-      const manageCall = this.getManageCall([
-        ...callSet1.map(i => i.step), ...callSet2.map(i => i.step)
-      ], [...callSet1.map(i => i.manageCall), ...callSet2.map(i => i.manageCall)]);
-      return manageCall;
-    } else {
-      const manageCall = this.getManageCall([
-        ...callSet2.map(i => i.step), ...callSet1.map(i => i.step)
-      ], [...callSet2.map(i => i.manageCall), ...callSet1.map(i => i.manageCall)]);
-      return manageCall;
-    }
-  }
-}
+//     if (isRebalanceNeeded1) {
+//       const amount = await this.getLegRebalanceAmount(vesuAdapters[0], leg1HealthFactor, false);
+//       const leg2HF = await this.getNewHealthFactor(vesuAdapters[1], amount, true);
+//       assert(leg2HF > minHf, `Rebalance Leg1 failed: Leg2 HF after rebalance would be too low: ${leg2HF}`);
+//       return [await this.getRebalanceCall({
+//         isLeg1toLeg2: false,
+//         amount: amount
+//       })];
+//     } else {
+//       const amount = await this.getLegRebalanceAmount(vesuAdapters[1], leg2HealthFactor, true);
+//       const leg1HF = await this.getNewHealthFactor(vesuAdapters[0], amount, false);
+//       assert(leg1HF > minHf, `Rebalance Leg2 failed: Leg1 HF after rebalance would be too low: ${leg1HF}`);
+//       return [await this.getRebalanceCall({
+//         isLeg1toLeg2: true,
+//         amount: amount
+//       })];
+//     }
+//   }
+
+//   private async getNewHealthFactor(vesuAdapter: VesuAdapter, newAmount: Web3Number, isWithdraw: boolean) {
+//     const {
+//       collateralTokenAmount,
+//       collateralUSDAmount,
+//       collateralPrice,
+//       debtTokenAmount,
+//       debtUSDAmount,
+//       debtPrice,
+//       ltv
+//     } = await vesuAdapter.getAssetPrices();
+
+//     if (isWithdraw) {
+//       const newHF = ((collateralTokenAmount.toNumber() - newAmount.toNumber()) * collateralPrice * ltv) / debtUSDAmount;
+//       logger.verbose(`getNewHealthFactor:: HF: ${newHF}, amoutn: ${newAmount.toNumber()}, isDeposit`);
+//       return newHF;
+//     } else { // is borrow
+//       const newHF = (collateralUSDAmount * ltv) / ((debtTokenAmount.toNumber() + newAmount.toNumber()) * debtPrice);
+//       logger.verbose(`getNewHealthFactor:: HF: ${newHF}, amoutn: ${newAmount.toNumber()}, isRepay`);
+//       return newHF;
+//     }
+//   }
+
+//   /**
+//    * 
+//    * @param vesuAdapter 
+//    * @param currentHf 
+//    * @param isDeposit if true, attempt by adding collateral, else by repaying
+//    * @returns 
+//    */
+//   private async getLegRebalanceAmount(vesuAdapter: VesuAdapter, currentHf: number, isDeposit: boolean) {
+//     const {
+//       collateralTokenAmount,
+//       collateralUSDAmount,
+//       collateralPrice,
+//       debtTokenAmount,
+//       debtUSDAmount,
+//       debtPrice,
+//       ltv
+//     } = await vesuAdapter.getAssetPrices();
+
+//     // debt is zero, nothing to rebalance
+//     if(debtTokenAmount.isZero()) {
+//       return Web3Number.fromWei(0, 0);
+//     }
+
+//     assert(collateralPrice > 0 && debtPrice > 0, "getRebalanceAmount: Invalid price");
+
+//     // avoid calculating for too close
+//     const targetHF = this.metadata.additionalInfo.targetHealthFactor;
+//     if (currentHf > targetHF - 0.01) 
+//       throw new Error("getLegRebalanceAmount: Current health factor is healthy");
+
+//     if (isDeposit) {
+//       // TargetHF = (collAmount + newAmount) * price * ltv / debtUSD
+//       const newAmount = targetHF * debtUSDAmount / (collateralPrice * ltv) - collateralTokenAmount.toNumber();
+//       logger.verbose(`${this.getTag()}:: getLegRebalanceAmount: addCollateral, currentHf: ${currentHf}, targetHF: ${targetHF}, collAmount: ${collateralTokenAmount.toString()}, collUSD: ${collateralUSDAmount}, collPrice: ${collateralPrice}, debtAmount: ${debtTokenAmount.toString()}, debtUSD: ${debtUSDAmount}, debtPrice: ${debtPrice}, ltv: ${ltv}, newAmount: ${newAmount}`);
+//       return new Web3Number(newAmount.toFixed(8), collateralTokenAmount.decimals);
+//     } else {
+//       // TargetHF = collUSD * ltv / (debtAmount - newAmount) * debtPrice
+//       const newAmount =  debtTokenAmount.toNumber() - collateralUSDAmount * ltv / (targetHF * debtPrice);
+//       logger.verbose(`${this.getTag()}:: getLegRebalanceAmount: repayDebt, currentHf: ${currentHf}, targetHF: ${targetHF}, collAmount: ${collateralTokenAmount.toString()}, collUSD: ${collateralUSDAmount}, collPrice: ${collateralPrice}, debtAmount: ${debtTokenAmount.toString()}, debtUSD: ${debtUSDAmount}, debtPrice: ${debtPrice}, ltv: ${ltv}, newAmount: ${newAmount}`);
+//       return new Web3Number(newAmount.toFixed(8), debtTokenAmount.decimals);
+//     }
+//   }
+
+//   async getVesuModifyPositionCall(params: {
+//     isDeposit: boolean,
+//     leg1DepositAmount: Web3Number
+//   }) {
+//     const [vesuAdapter1, vesuAdapter2] = this.getVesuAdapters();
+//     const leg1LTV = await vesuAdapter1.getLTVConfig(this.config);
+//     const leg2LTV = await vesuAdapter2.getLTVConfig(this.config);
+//     logger.verbose(`${this.getTag()}: LTVLeg1: ${leg1LTV}`);
+//     logger.verbose(`${this.getTag()}: LTVLeg2: ${leg2LTV}`);
+
+//     const token1Price = await this.pricer.getPrice(vesuAdapter1.config.collateral.symbol);
+//     const token2Price = await this.pricer.getPrice(vesuAdapter2.config.collateral.symbol);
+//     logger.verbose(`${this.getTag()}: Price${vesuAdapter1.config.collateral.symbol}: ${token1Price.price}`);
+//     logger.verbose(`${this.getTag()}: Price${vesuAdapter2.config.collateral.symbol}: ${token2Price.price}`);
+
+//     const TARGET_HF = this.metadata.additionalInfo.targetHealthFactor;
+
+//     const k1 = token1Price.price * leg1LTV  / token2Price.price / TARGET_HF;
+//     const k2 = token1Price.price * TARGET_HF / token2Price.price / leg2LTV;
+
+//     const borrow2Amount = new Web3Number(
+//       params.leg1DepositAmount.multipliedBy(k1.toFixed(6)).dividedBy(k2 - k1).toFixed(6),
+//       vesuAdapter2.config.debt.decimals
+//     );
+//     const borrow1Amount = new Web3Number(
+//       borrow2Amount.multipliedBy(k2).toFixed(6),
+//       vesuAdapter1.config.debt.decimals
+//     );
+//     logger.verbose(`${this.getTag()}:: leg1DepositAmount: ${params.leg1DepositAmount.toString()} ${vesuAdapter1.config.collateral.symbol}`);
+//     logger.verbose(`${this.getTag()}:: borrow1Amount: ${borrow1Amount.toString()} ${vesuAdapter1.config.debt.symbol}`);
+//     logger.verbose(`${this.getTag()}:: borrow2Amount: ${borrow2Amount.toString()} ${vesuAdapter2.config.debt.symbol}`);
+
+//     let callSet1 = this.getVesuModifyPositionCalls({
+//       isLeg1: true,
+//       isDeposit: params.isDeposit,
+//       depositAmount: params.leg1DepositAmount.plus(borrow2Amount),
+//       debtAmount: borrow1Amount
+//     });
+
+//     let callSet2 = this.getVesuModifyPositionCalls({
+//       isLeg1: false,
+//       isDeposit: params.isDeposit,
+//       depositAmount: borrow1Amount,
+//       debtAmount: borrow2Amount
+//     });
+
+//     if (!params.isDeposit) {
+//       let temp = callSet2;
+//       callSet2 = [...callSet1];
+//       callSet1 = [...temp];
+//     }
+//     const allActions = [...callSet1.map(i => i.manageCall), ...callSet2.map(i => i.manageCall)];
+//     const flashloanCalldata = CallData.compile([
+//         [...callSet1.map(i => i.proofs), ...callSet2.map(i => i.proofs)],
+//         allActions.map(i => i.sanitizer.address),
+//         allActions.map(i => i.call.contractAddress.address),
+//         allActions.map(i => i.call.selector),
+//         allActions.map(i => i.call.calldata)
+//     ])
+
+//     // flash loan
+//     const STEP1_ID = UNIVERSAL_MANAGE_IDS.FLASH_LOAN;
+//     const manage1Info = this.getProofs<FlashloanCallParams>(STEP1_ID);
+//     const manageCall1 = manage1Info.callConstructor({
+//         amount: borrow2Amount,
+//         data: flashloanCalldata.map(i => BigInt(i))
+//     })
+//     const manageCall = this.getManageCall([UNIVERSAL_MANAGE_IDS.FLASH_LOAN], [manageCall1]);
+//     return manageCall;
+//   }
+
+//   async getBringLiquidityCall(params: {
+//     amount: Web3Number
+//   }) {
+//     const manage1Info = this.getProofs<ApproveCallParams>(UNIVERSAL_MANAGE_IDS.APPROVE_BRING_LIQUIDITY);
+//     const manageCall1 = manage1Info.callConstructor({
+//         amount: params.amount
+//     });
+//     const manage2Info = this.getProofs<ApproveCallParams>(UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY);
+//     const manageCall2 = manage2Info.callConstructor({
+//         amount: params.amount
+//     });
+//     const manageCall = this.getManageCall([UNIVERSAL_MANAGE_IDS.APPROVE_BRING_LIQUIDITY, UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY], [manageCall1, manageCall2]);
+//     return manageCall;
+//   }
+
+//   async getHarvestCall() {
+//     const vesuHarvest = new VesuHarvests(this.config);
+//     const harvestInfo = await vesuHarvest.getUnHarvestedRewards(this.metadata.additionalInfo.vaultAllocator);
+//     if (harvestInfo.length != 1) {
+//       throw new Error(`Expected 1 harvest info, got ${harvestInfo.length}`);
+//     }
+
+//     const amount = harvestInfo[0].claim.amount;
+//     const actualReward = harvestInfo[0].actualReward;
+//     const proofs = harvestInfo[0].proof;
+//     if (actualReward.isZero()) {
+//       throw new Error(`Expected non-zero actual reward, got ${harvestInfo[0].actualReward}`);
+//     }
+
+//     const manage1Info = this.getProofs<VesuDefiSpringRewardsCallParams>(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS);
+//     const manageCall1 = manage1Info.callConstructor({
+//         amount,
+//         proofs
+//     });
+//     const proofIds: string[] = [UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS];
+//     const manageCalls: ManageCall[] = [manageCall1];
+
+//     // swap rewards for underlying
+//     const STRK = Global.getDefaultTokens().find(t => t.symbol === 'STRK')!;
+//     if (this.asset().symbol != 'STRK') {
+//       // approve
+//       const manage2Info = this.getProofs<ApproveCallParams>(UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1);
+//       const manageCall2 = manage2Info.callConstructor({
+//           amount: actualReward
+//       });
+
+//       // swap
+//       const avnuModule = new AvnuWrapper();
+//       const quote = await avnuModule.getQuotes(
+//           STRK.address.address,
+//           this.asset().address.address,
+//           actualReward.toWei(),
+//           this.address.address
+//       );
+//       const swapInfo = await avnuModule.getSwapInfo(quote, this.address.address, 0, this.address.address);
+//       const manage3Info = this.getProofs<AvnuSwapCallParams>(UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS);
+//       const manageCall3 = manage3Info.callConstructor({
+//           props: swapInfo
+//       });
+//       proofIds.push(UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1);
+//       proofIds.push(UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS);
+
+//       manageCalls.push(manageCall2);
+//       manageCalls.push(manageCall3);
+//     }
+
+//     const manageCall = this.getManageCall(proofIds, manageCalls);
+//     return { call: manageCall, reward: actualReward, tokenInfo: STRK };
+//   }
+
+//   async getRebalanceCall(params: {
+//     isLeg1toLeg2: boolean,
+//     amount: Web3Number
+//   }) {
+//     let callSet1 = this.getVesuModifyPositionCalls({
+//       isLeg1: true,
+//       isDeposit: params.isLeg1toLeg2,
+//       depositAmount: Web3Number.fromWei(0, 0),
+//       debtAmount: params.amount
+//     });
+
+//     let callSet2 = this.getVesuModifyPositionCalls({
+//       isLeg1: false,
+//       isDeposit: params.isLeg1toLeg2,
+//       depositAmount: params.amount,
+//       debtAmount: Web3Number.fromWei(0, 0)
+//     });
+
+//     if (params.isLeg1toLeg2) {
+//       const manageCall = this.getManageCall([
+//         ...callSet1.map(i => i.step), ...callSet2.map(i => i.step)
+//       ], [...callSet1.map(i => i.manageCall), ...callSet2.map(i => i.manageCall)]);
+//       return manageCall;
+//     } else {
+//       const manageCall = this.getManageCall([
+//         ...callSet2.map(i => i.step), ...callSet1.map(i => i.step)
+//       ], [...callSet2.map(i => i.manageCall), ...callSet1.map(i => i.manageCall)]);
+//       return manageCall;
+//     }
+//   }
+// }
 
 
 // useful to map readble names to proofs and calls
@@ -842,414 +757,417 @@ export enum UNIVERSAL_MANAGE_IDS {
   AVNU_SWAP_REWARDS = 'avnu_swap_rewards'
 }
 
-export enum UNIVERSAL_ADAPTERS {
-  COMMON = 'common_adapter',
-  VESU_LEG1 = 'vesu_leg1_adapter',
-  VESU_LEG2 = 'vesu_leg2_adapter'
-}
-
-function getLooperSettings(
-  token1Symbol: string,
-  token2Symbol: string,
-  vaultSettings: UniversalStrategySettings,
-  pool1: ContractAddr,
-  pool2: ContractAddr,
-) {
-  const USDCToken = Global.getDefaultTokens().find(token => token.symbol === token1Symbol)!;
-  const ETHToken = Global.getDefaultTokens().find(token => token.symbol === token2Symbol)!;
-
-  const commonAdapter = new CommonAdapter({
-    manager: vaultSettings.manager,
-    asset: USDCToken.address,
-    id: UNIVERSAL_MANAGE_IDS.FLASH_LOAN,
-    vaultAddress: vaultSettings.vaultAddress,
-    vaultAllocator: vaultSettings.vaultAllocator,
-  })
-  const vesuAdapterUSDCETH = new VesuAdapter({
-    poolId: pool1,
-    collateral: USDCToken,
-    debt: ETHToken,
-    vaultAllocator: vaultSettings.vaultAllocator,
-    id: UNIVERSAL_MANAGE_IDS.VESU_LEG1
-  })
-  const vesuAdapterETHUSDC = new VesuAdapter({
-    poolId: pool2,
-    collateral: ETHToken,
-    debt: USDCToken,
-    vaultAllocator: vaultSettings.vaultAllocator,
-    id: UNIVERSAL_MANAGE_IDS.VESU_LEG2
-  })
-  vaultSettings.adapters.push(...[{
-    id: UNIVERSAL_ADAPTERS.COMMON,
-    adapter: commonAdapter
-  }, {
-    id: UNIVERSAL_ADAPTERS.VESU_LEG1,
-    adapter: vesuAdapterUSDCETH
-  }, {
-    id: UNIVERSAL_ADAPTERS.VESU_LEG2,
-    adapter: vesuAdapterETHUSDC
-  }])
-
-  // vesu looping
-  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, 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));
+// export enum UNIVERSAL_ADAPTERS {
+//   COMMON = 'common_adapter',
+//   VESU_LEG1 = 'vesu_leg1_adapter',
+//   VESU_LEG2 = 'vesu_leg2_adapter'
+// }
+
+// function getLooperSettings(
+//   token1Symbol: string,
+//   token2Symbol: string,
+//   vaultSettings: UniversalStrategySettings,
+//   pool1: ContractAddr,
+//   pool2: ContractAddr,
+// ) {
+//   const USDCToken = Global.getDefaultTokens().find(token => token.symbol === token1Symbol)!;
+//   const ETHToken = Global.getDefaultTokens().find(token => token.symbol === token2Symbol)!;
+
+//   const commonAdapter = new CommonAdapter({
+//     manager: vaultSettings.manager,
+//     asset: USDCToken.address,
+//     id: UNIVERSAL_MANAGE_IDS.FLASH_LOAN,
+//     vaultAddress: vaultSettings.vaultAddress,
+//     vaultAllocator: vaultSettings.vaultAllocator,
+//   })
+//   const vesuAdapterUSDCETH = new VesuAdapter({
+//     poolId: pool1,
+//     collateral: USDCToken,
+//     debt: ETHToken,
+//     vaultAllocator: vaultSettings.vaultAllocator,
+//     id: UNIVERSAL_MANAGE_IDS.VESU_LEG1
+//   })
+//   const vesuAdapterETHUSDC = new VesuAdapter({
+//     poolId: pool2,
+//     collateral: ETHToken,
+//     debt: USDCToken,
+//     vaultAllocator: vaultSettings.vaultAllocator,
+//     id: UNIVERSAL_MANAGE_IDS.VESU_LEG2
+//   })
+//   vaultSettings.adapters.push(...[{
+//     id: UNIVERSAL_ADAPTERS.COMMON,
+//     adapter: commonAdapter
+//   }, {
+//     id: UNIVERSAL_ADAPTERS.VESU_LEG1,
+//     adapter: vesuAdapterUSDCETH
+//   }, {
+//     id: UNIVERSAL_ADAPTERS.VESU_LEG2,
+//     adapter: vesuAdapterETHUSDC
+//   }])
+
+//   // vesu looping
+//   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, 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));
-  vaultSettings.leafAdapters.push(commonAdapter.getBringLiquidityAdapter(UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY).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));
+//   vaultSettings.leafAdapters.push(commonAdapter.getBringLiquidityAdapter(UNIVERSAL_MANAGE_IDS.BRING_LIQUIDITY).bind(commonAdapter));
   
-  // claim rewards
-  vaultSettings.leafAdapters.push(vesuAdapterUSDCETH.getDefispringRewardsAdapter(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS).bind(vesuAdapterUSDCETH));
-
-  // avnu swap
-  const STRKToken = Global.getDefaultTokens().find(token => token.symbol === 'STRK')!;
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(STRKToken.address, AVNU_MIDDLEWARE, UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1).bind(commonAdapter));
-  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, USDCToken.address, UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS, true).bind(commonAdapter));
-  return vaultSettings;
-}
-
-const _riskFactor: RiskFactor[] = [
-  { type: RiskType.SMART_CONTRACT_RISK, value: 0.5, weight: 25, reason: "Audited by Zellic" },
-  { type: RiskType.LIQUIDATION_RISK, value: 1.5, weight: 50, reason: "Liquidation risk is mitigated by stable price feed on Starknet" },
-  { type: RiskType.TECHNICAL_RISK, value: 1, weight: 50, reason: "Technical failures like risk monitoring failures" }
-];
-
-const usdcVaultSettings: UniversalStrategySettings = {
-  vaultAddress: ContractAddr.from('0x7e6498cf6a1bfc7e6fc89f1831865e2dacb9756def4ec4b031a9138788a3b5e'),
-  manager: ContractAddr.from('0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07'),
-  vaultAllocator: ContractAddr.from('0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba'),
-  redeemRequestNFT: ContractAddr.from('0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda'),
-  aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.25,
-  minHealthFactor: 1.15
-}
-
-const wbtcVaultSettings: UniversalStrategySettings = {
-  vaultAddress: ContractAddr.from('0x5a4c1651b913aa2ea7afd9024911603152a19058624c3e425405370d62bf80c'),
-  manager: ContractAddr.from('0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34'),
-  vaultAllocator: ContractAddr.from('0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735'),
-  redeemRequestNFT: ContractAddr.from('0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2'),
-  aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.20,
-  minHealthFactor: 1.15
-}
-
-const ethVaultSettings: UniversalStrategySettings = {
-  vaultAddress: ContractAddr.from('0x446c22d4d3f5cb52b4950ba832ba1df99464c6673a37c092b1d9622650dbd8'),
-  manager: ContractAddr.from('0x494888b37206616bd09d759dcda61e5118470b9aa7f58fb84f21c778a7b8f97'),
-  vaultAllocator: ContractAddr.from('0x4acc0ad6bea58cb578d60ff7c31f06f44369a7a9a7bbfffe4701f143e427bd'),
-  redeemRequestNFT: ContractAddr.from('0x2e6cd71e5060a254d4db00655e420db7bf89da7755bb0d5f922e2f00c76ac49'),
-  aumOracle: ContractAddr.from("0x4b747f2e75c057bed9aa2ce46fbdc2159dc684c15bd32d4f95983a6ecf39a05"),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.25,
-  minHealthFactor: 1.21
-}
-
-const strkVaultSettings: UniversalStrategySettings = {
-  vaultAddress: ContractAddr.from('0x55d012f57e58c96e0a5c7ebbe55853989d01e6538b15a95e7178aca4af05c21'),
-  manager: ContractAddr.from('0xcc6a5153ca56293405506eb20826a379d982cd738008ef7e808454d318fb81'),
-  vaultAllocator: ContractAddr.from('0xf29d2f82e896c0ed74c9eff220af34ac148e8b99846d1ace9fbb02c9191d01'),
-  redeemRequestNFT: ContractAddr.from('0x46902423bd632c428376b84fcee9cac5dbe016214e93a8103bcbde6e1de656b'),
-  aumOracle: ContractAddr.from("0x6d7dbfad4bb51715da211468389a623da00c0625f8f6efbea822ee5ac5231f4"),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.20,
-  minHealthFactor: 1.15
-}
-
-const usdtVaultSettings: UniversalStrategySettings = {
-  vaultAddress: ContractAddr.from('0x1c4933d1880c6778585e597154eaca7b428579d72f3aae425ad2e4d26c6bb3'),
-  manager: ContractAddr.from('0x39bb9843503799b552b7ed84b31c06e4ff10c0537edcddfbf01fe944b864029'),
-  vaultAllocator: ContractAddr.from('0x56437d18c43727ac971f6c7086031cad7d9d6ccb340f4f3785a74cc791c931a'),
-  redeemRequestNFT: ContractAddr.from('0x5af0c2a657eaa8e23ed78e855dac0c51e4f69e2cf91a18c472041a1f75bb41f'),
-  aumOracle: ContractAddr.from("0x7018f8040c8066a4ab929e6760ae52dd43b6a3a289172f514750a61fcc565cc"),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.25,
-  minHealthFactor: 1.15
-}
-
-type AllowedSources = 'vesu' | 'endur' | 'extended';
-export default function MetaVaultDescription(allowedSources: AllowedSources[]) {
-  const logos: any = {
-    vesu: Protocols.VESU.logo,
-    endur: Protocols.ENDUR.logo,
-    extended: Protocols.EXTENDED.logo,
-    ekubo: "https://dummyimage.com/64x64/ffffff/000000&text=K",
-  };
-  const _sources = [
-    { key: "vesu", name: "Vesu", status: "Live", description: "Integrated liquidity venue used for automated routing to capture the best available yield." },
-    { key: "endur", name: "Endur", status: "Coming soon", description: "Planned integration to tap into STRK staking–backed yields via our LST pipeline." },
-    { key: "extended", name: "Extended", status: "Coming soon", description: "Expanding coverage to additional money markets and vaults across the ecosystem." },
-    // { key: "ekubo", name: "Ekubo", status: "Coming soon", description: "Concentrated liquidity strategies targeted for optimized fee APR harvesting." },
-  ];
-  const sources = _sources.filter(s => allowedSources.includes(s.key as any));
-
-  const containerStyle = {
-    maxWidth: "800px",
-    margin: "0 auto",
-    backgroundColor: "#111",
-    color: "#eee",
-    fontFamily: "Arial, sans-serif",
-    borderRadius: "12px",
-  };
-
-  const cardStyle = {
-    border: "1px solid #333",
-    borderRadius: "10px",
-    padding: "12px",
-    marginBottom: "12px",
-    backgroundColor: "#1a1a1a",
-  };
-
-  const logoStyle = {
-    width: "24px",
-    height: "24px",
-    borderRadius: "8px",
-    border: "1px solid #444",
-    backgroundColor: "#222",
-  };
-
-  return (
-    <div style={containerStyle}>
-      <h1 style={{ fontSize: "18px", marginBottom: "10px" }}>Meta Vault — Automated Yield Router</h1>
-      <p style={{ fontSize: "14px", lineHeight: "1.5", marginBottom: "16px" }}>
-        This Evergreen vault is a tokenized Meta Vault, auto-compounding strategy that continuously allocates your deposited
-        asset to the best available yield source in the ecosystem. Depositors receive vault shares that
-        represent a proportional claim on the underlying assets and accrued yield. Allocation shifts are
-        handled programmatically based on on-chain signals and risk filters, minimizing idle capital and
-        maximizing net APY.
-      </p>
-
-      <div style={{ backgroundColor: "#222", padding: "10px", borderRadius: "8px", marginBottom: "20px", border: "1px solid #444" }}>
-        <p style={{ fontSize: "13px", color: "#ccc" }}>
-          <strong>Withdrawals:</strong> Requests can take up to <strong>1-2 hours</strong> to process as the vault unwinds and settles routing.
-        </p>
-      </div>
-
-      <h2 style={{ fontSize: "18px", marginBottom: "10px" }}>Supported Yield Sources</h2>
-      {sources.map((s) => (
-        <div key={s.key} style={cardStyle}>
-          <div style={{ display: "flex", gap: "10px", alignItems: "flex-start" }}>
-            <img src={logos[s.key]} alt={`${s.name} logo`} style={logoStyle} />
-            <div style={{ flex: 1 }}>
-              <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-                <h3 style={{ fontSize: "15px", margin: 0 }}>{s.name}</h3>
-                <StatusBadge status={s.status} />
-              </div>
-              {/* <p style={{ fontSize: "13px", color: "#ccc", marginTop: "4px" }}>{s.description}</p> */}
-            </div>
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function StatusBadge({ status }: { status: string }) {
-  const isSoon = String(status).toLowerCase() !== "live";
-  const badgeStyle = {
-    fontSize: "12px",
-    padding: "2px 6px",
-    borderRadius: "12px",
-    border: "1px solid",
-    color: isSoon ? "rgb(196 196 195)" : "#6aff7d",
-    borderColor: isSoon ? "#484848" : "#6aff7d",
-    backgroundColor: isSoon ? "#424242" : "#002b1a",
-  };
-  return <span style={badgeStyle}>{status}</span>;
-}
-
-function getDescription(tokenSymbol: string, allowedSources: AllowedSources[]) {
-  return MetaVaultDescription(allowedSources);
-}
-
-function getFAQs(): FAQ[] {
-  return [
-    {
-      question: "What is the Meta Vault?",
-      answer:
-        "The Meta Vault is a tokenized strategy that automatically allocates your deposited assets to the best available yield source in the ecosystem. It optimizes returns while minimizing idle capital.",
-    },
-    {
-      question: "How does yield allocation work?",
-      answer:
-        "The vault continuously monitors supported protocols and routes liquidity to the source offering the highest net yield after accounting for fees, slippage, and gas costs. Reallocations are performed automatically.",
-    },
-    {
-      question: "Which yield sources are supported?",
-      answer: (
-        <span>
-          Currently, <strong>Vesu</strong> is live. Future integrations may include{" "}
-          <strong>Endur</strong>, <strong>Extended</strong>, and{" "}
-          <strong>Ekubo</strong> (all coming soon).
-        </span>
-      ),
-    },
-    {
-      question: "What do I receive when I deposit?",
-      answer:
-        "Depositors receive vault tokens representing their proportional share of the vault. These tokens entitle holders to both the principal and accrued yield.",
-    },
-    {
-      question: "How long do withdrawals take?",
-      answer:
-        "Withdrawals may take up to 1-2 hours to process, as the vault unwinds and settles liquidity routing across integrated protocols.",
-    },
-    {
-      question: "Is the Meta Vault non-custodial?",
-      answer:
-        "Yes. The Meta Vault operates entirely on-chain. Users always maintain control of their vault tokens, and the strategy is fully transparent.",
-    },
-    {
-      question: "How is risk managed?",
-      answer:
-        "Integrations are supported with active risk monitoring like liquidation risk. Only vetted protocols are included to balance yield with safety. However, usual Defi risks like smart contract risk, extreme volatile market risk, etc. are still present.",
-    },
-    {
-      question: "Are there any fees?",
-      answer:
-        "Troves charges a performance of 10% on the yield generated. The APY shown is net of this fee. This fee is only applied to the profits earned, ensuring that users retain their initial capital.",
-    },
-  ];
-}
-
-export function getContractDetails(settings: UniversalStrategySettings): {address: ContractAddr, name: string}[] {
-  return [
+//   // claim rewards
+//   vaultSettings.leafAdapters.push(vesuAdapterUSDCETH.getDefispringRewardsAdapter(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS).bind(vesuAdapterUSDCETH));
+
+//   // avnu swap
+//   const STRKToken = Global.getDefaultTokens().find(token => token.symbol === 'STRK')!;
+//   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(STRKToken.address, AVNU_MIDDLEWARE, UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1).bind(commonAdapter));
+//   vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, USDCToken.address, UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS, true).bind(commonAdapter));
+//   return vaultSettings;
+// }
+
+// const _riskFactor: RiskFactor[] = [
+//   { type: RiskType.SMART_CONTRACT_RISK, value: 0.5, weight: 25, reason: "Audited by Zellic" },
+//   { type: RiskType.LIQUIDATION_RISK, value: 1.5, weight: 50, reason: "Liquidation risk is mitigated by stable price feed on Starknet" },
+//   { type: RiskType.TECHNICAL_RISK, value: 1, weight: 50, reason: "Technical failures like risk monitoring failures" }
+// ];
+
+// const usdcVaultSettings: UniversalStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x7e6498cf6a1bfc7e6fc89f1831865e2dacb9756def4ec4b031a9138788a3b5e'),
+//   manager: ContractAddr.from('0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07'),
+//   vaultAllocator: ContractAddr.from('0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba'),
+//   redeemRequestNFT: ContractAddr.from('0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda'),
+//   aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.3,
+//   minHealthFactor: 1.25
+// }
+
+// const wbtcVaultSettings: UniversalStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x5a4c1651b913aa2ea7afd9024911603152a19058624c3e425405370d62bf80c'),
+//   manager: ContractAddr.from('0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34'),
+//   vaultAllocator: ContractAddr.from('0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735'),
+//   redeemRequestNFT: ContractAddr.from('0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2'),
+//   aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.3,
+//   minHealthFactor: 1.25
+// }
+
+// const ethVaultSettings: UniversalStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x446c22d4d3f5cb52b4950ba832ba1df99464c6673a37c092b1d9622650dbd8'),
+//   manager: ContractAddr.from('0x494888b37206616bd09d759dcda61e5118470b9aa7f58fb84f21c778a7b8f97'),
+//   vaultAllocator: ContractAddr.from('0x4acc0ad6bea58cb578d60ff7c31f06f44369a7a9a7bbfffe4701f143e427bd'),
+//   redeemRequestNFT: ContractAddr.from('0x2e6cd71e5060a254d4db00655e420db7bf89da7755bb0d5f922e2f00c76ac49'),
+//   aumOracle: ContractAddr.from("0x4b747f2e75c057bed9aa2ce46fbdc2159dc684c15bd32d4f95983a6ecf39a05"),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.3,
+//   minHealthFactor: 1.25
+// }
+
+// const strkVaultSettings: UniversalStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x55d012f57e58c96e0a5c7ebbe55853989d01e6538b15a95e7178aca4af05c21'),
+//   manager: ContractAddr.from('0xcc6a5153ca56293405506eb20826a379d982cd738008ef7e808454d318fb81'),
+//   vaultAllocator: ContractAddr.from('0xf29d2f82e896c0ed74c9eff220af34ac148e8b99846d1ace9fbb02c9191d01'),
+//   redeemRequestNFT: ContractAddr.from('0x46902423bd632c428376b84fcee9cac5dbe016214e93a8103bcbde6e1de656b'),
+//   aumOracle: ContractAddr.from("0x6d7dbfad4bb51715da211468389a623da00c0625f8f6efbea822ee5ac5231f4"),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.3,
+//   minHealthFactor: 1.25
+// }
+
+// const usdtVaultSettings: UniversalStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x1c4933d1880c6778585e597154eaca7b428579d72f3aae425ad2e4d26c6bb3'),
+//   manager: ContractAddr.from('0x39bb9843503799b552b7ed84b31c06e4ff10c0537edcddfbf01fe944b864029'),
+//   vaultAllocator: ContractAddr.from('0x56437d18c43727ac971f6c7086031cad7d9d6ccb340f4f3785a74cc791c931a'),
+//   redeemRequestNFT: ContractAddr.from('0x5af0c2a657eaa8e23ed78e855dac0c51e4f69e2cf91a18c472041a1f75bb41f'),
+//   aumOracle: ContractAddr.from("0x7018f8040c8066a4ab929e6760ae52dd43b6a3a289172f514750a61fcc565cc"),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.3,
+//   minHealthFactor: 1.25
+// }
+
+// type AllowedSources = 'vesu' | 'endur' | 'extended';
+// export default function MetaVaultDescription(allowedSources: AllowedSources[]) {
+//   const logos: any = {
+//     vesu: Protocols.VESU.logo,
+//     endur: Protocols.ENDUR.logo,
+//     extended: Protocols.EXTENDED.logo,
+//     ekubo: "https://dummyimage.com/64x64/ffffff/000000&text=K",
+//   };
+//   const _sources = [
+//     { key: "vesu", name: "Vesu", status: "Live", description: "Integrated liquidity venue used for automated routing to capture the best available yield." },
+//     { key: "endur", name: "Endur", status: "Coming soon", description: "Planned integration to tap into STRK staking–backed yields via our LST pipeline." },
+//     { key: "extended", name: "Extended", status: "Coming soon", description: "Expanding coverage to additional money markets and vaults across the ecosystem." },
+//     // { key: "ekubo", name: "Ekubo", status: "Coming soon", description: "Concentrated liquidity strategies targeted for optimized fee APR harvesting." },
+//   ];
+//   const sources = _sources.filter(s => allowedSources.includes(s.key as any));
+
+//   const containerStyle = {
+//     maxWidth: "800px",
+//     margin: "0 auto",
+//     backgroundColor: "#111",
+//     color: "#eee",
+//     fontFamily: "Arial, sans-serif",
+//     borderRadius: "12px",
+//   };
+
+//   const cardStyle = {
+//     border: "1px solid #333",
+//     borderRadius: "10px",
+//     padding: "12px",
+//     marginBottom: "12px",
+//     backgroundColor: "#1a1a1a",
+//   };
+
+//   const logoStyle = {
+//     width: "24px",
+//     height: "24px",
+//     borderRadius: "8px",
+//     border: "1px solid #444",
+//     backgroundColor: "#222",
+//   };
+
+//   return (
+//     <div style={containerStyle}>
+//       <h1 style={{ fontSize: "18px", marginBottom: "10px" }}>Meta Vault — Automated Yield Router</h1>
+//       <p style={{ fontSize: "14px", lineHeight: "1.5", marginBottom: "16px" }}>
+//         This Evergreen vault is a tokenized Meta Vault, auto-compounding strategy that continuously allocates your deposited
+//         asset to the best available yield source in the ecosystem. Depositors receive vault shares that
+//         represent a proportional claim on the underlying assets and accrued yield. Allocation shifts are
+//         handled programmatically based on on-chain signals and risk filters, minimizing idle capital and
+//         maximizing net APY.
+//       </p>
+
+//       <div style={{ backgroundColor: "#222", padding: "10px", borderRadius: "8px", marginBottom: "20px", border: "1px solid #444" }}>
+//         <p style={{ fontSize: "13px", color: "#ccc" }}>
+//           <strong>Withdrawals:</strong> Requests can take up to <strong>1-2 hours</strong> to process as the vault unwinds and settles routing.
+//         </p>
+//       </div>
+
+//       <h2 style={{ fontSize: "18px", marginBottom: "10px" }}>Supported Yield Sources</h2>
+//       {sources.map((s) => (
+//         <div key={s.key} style={cardStyle}>
+//           <div style={{ display: "flex", gap: "10px", alignItems: "flex-start" }}>
+//             <img src={logos[s.key]} alt={`${s.name} logo`} style={logoStyle} />
+//             <div style={{ flex: 1 }}>
+//               <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+//                 <h3 style={{ fontSize: "15px", margin: 0 }}>{s.name}</h3>
+//                 <StatusBadge status={s.status} />
+//               </div>
+//               {/* <p style={{ fontSize: "13px", color: "#ccc", marginTop: "4px" }}>{s.description}</p> */}
+//             </div>
+//           </div>
+//         </div>
+//       ))}
+//     </div>
+//   );
+// }
+
+// function StatusBadge({ status }: { status: string }) {
+//   const isSoon = String(status).toLowerCase() !== "live";
+//   const badgeStyle = {
+//     fontSize: "12px",
+//     padding: "2px 6px",
+//     borderRadius: "12px",
+//     border: "1px solid",
+//     color: isSoon ? "rgb(196 196 195)" : "#6aff7d",
+//     borderColor: isSoon ? "#484848" : "#6aff7d",
+//     backgroundColor: isSoon ? "#424242" : "#002b1a",
+//   };
+//   return <span style={badgeStyle}>{status}</span>;
+// }
+
+// function getDescription(tokenSymbol: string, allowedSources: AllowedSources[]) {
+//   return MetaVaultDescription(allowedSources);
+// }
+
+// function getFAQs(): FAQ[] {
+//   return [
+//     {
+//       question: "What is the Meta Vault?",
+//       answer:
+//         "The Meta Vault is a tokenized strategy that automatically allocates your deposited assets to the best available yield source in the ecosystem. It optimizes returns while minimizing idle capital.",
+//     },
+//     {
+//       question: "How does yield allocation work?",
+//       answer:
+//         "The vault continuously monitors supported protocols and routes liquidity to the source offering the highest net yield after accounting for fees, slippage, and gas costs. Reallocations are performed automatically.",
+//     },
+//     {
+//       question: "Which yield sources are supported?",
+//       answer: (
+//         <span>
+//           Currently, <strong>Vesu</strong> is live. Future integrations may include{" "}
+//           <strong>Endur</strong>, <strong>Extended</strong>, and{" "}
+//           <strong>Ekubo</strong> (all coming soon).
+//         </span>
+//       ),
+//     },
+//     {
+//       question: "What do I receive when I deposit?",
+//       answer:
+//         "Depositors receive vault tokens representing their proportional share of the vault. These tokens entitle holders to both the principal and accrued yield.",
+//     },
+//     {
+//       question: "How long do withdrawals take?",
+//       answer:
+//         "Withdrawals may take up to 1-2 hours to process, as the vault unwinds and settles liquidity routing across integrated protocols.",
+//     },
+//     {
+//       question: "Is the Meta Vault non-custodial?",
+//       answer:
+//         "Yes. The Meta Vault operates entirely on-chain. Users always maintain control of their vault tokens, and the strategy is fully transparent.",
+//     },
+//     {
+//       question: "How is risk managed?",
+//       answer:
+//         "Integrations are supported with active risk monitoring like liquidation risk. Only vetted protocols are included to balance yield with safety. However, usual Defi risks like smart contract risk, extreme volatile market risk, etc. are still present.",
+//     },
+//     {
+//       question: "Are there any fees?",
+//       answer:
+//         "Troves charges a performance of 10% on the yield generated. The APY shown is net of this fee. This fee is only applied to the profits earned, ensuring that users retain their initial capital.",
+//     },
+//   ];
+// }
+
+export function getContractDetails(settings: UniversalStrategySettings & { aumOracle?: ContractAddr }): {address: ContractAddr, name: string}[] {
+  const contracts = [
     { address: settings.vaultAddress, name: "Vault" },
     { address: settings.manager, name: "Vault Manager" },
     { address: settings.vaultAllocator, name: "Vault Allocator" },
     { address: settings.redeemRequestNFT, name: "Redeem Request NFT" },
-    // { address: settings.aumOracle, name: "AUM Oracle" },
   ];
+  if (settings.aumOracle) {
+    contracts.push({ address: settings.aumOracle, name: "AUM Oracle" });
+  }
+  return contracts;
 }
 
-const investmentSteps: string[] = [
-  "Deposit funds into the vault",
-  "Vault manager allocates funds to optimal yield sources",
-  "Vault manager reports asset under management (AUM) regularly to the vault",
-  "Request withdrawal and vault manager processes it in 1-2 hours"
-]
-
-const AUDIT_URL = 'https://docs.troves.fi/p/security#starknet-vault-kit'
-export const UniversalStrategies: IStrategyMetadata<UniversalStrategySettings>[] =
-  [
-    {
-      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.e')!],
-      additionalInfo: getLooperSettings('USDC.e', 'ETH', usdcVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
-      risk: {
-        riskFactor: _riskFactor,
-        netRisk:
-          _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
-          _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
-        notARisks: getNoRiskTags(_riskFactor)
-      },
-      auditUrl: AUDIT_URL,
-      protocols: [Protocols.VESU],
-      maxTVL: Web3Number.fromWei(0, 6),
-      contractDetails: getContractDetails(usdcVaultSettings),
-      faqs: getFAQs(),
-      investmentSteps: investmentSteps,
-    },
-    {
-      name: "WBTC Evergreen",
-      description: getDescription('WBTC', ['vesu', 'endur', 'extended']),
-      address: ContractAddr.from('0x5a4c1651b913aa2ea7afd9024911603152a19058624c3e425405370d62bf80c'),
-      launchBlock: 0,
-      type: 'ERC4626',
-      depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!],
-      additionalInfo: getLooperSettings('WBTC', 'ETH', wbtcVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
-      risk: {
-        riskFactor: _riskFactor,
-        netRisk:
-          _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
-          _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
-        notARisks: getNoRiskTags(_riskFactor)
-      },
-      protocols: [Protocols.VESU],
-      maxTVL: Web3Number.fromWei(0, 8),
-      contractDetails: getContractDetails(wbtcVaultSettings),
-      faqs: getFAQs(),
-      investmentSteps: investmentSteps,
-      auditUrl: AUDIT_URL,
-    },
-    {
-      name: "ETH Evergreen",
-      description: getDescription('ETH', ['vesu', 'extended']),
-      address: ContractAddr.from('0x446c22d4d3f5cb52b4950ba832ba1df99464c6673a37c092b1d9622650dbd8'),
-      launchBlock: 0,
-      type: 'ERC4626',
-      depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'ETH')!],
-      additionalInfo: getLooperSettings('ETH', 'WBTC', ethVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
-      risk: {
-        riskFactor: _riskFactor,
-        netRisk:
-          _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
-          _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
-        notARisks: getNoRiskTags(_riskFactor)
-      },
-      protocols: [Protocols.VESU],
-      maxTVL: Web3Number.fromWei(0, 18),
-      contractDetails: getContractDetails(ethVaultSettings),
-      faqs: getFAQs(),
-      investmentSteps: investmentSteps,
-      auditUrl: AUDIT_URL,
-    },
-    {
-      name: "STRK Evergreen",
-      description: getDescription('STRK', ['vesu', 'endur', 'extended']),
-      address: ContractAddr.from('0x55d012f57e58c96e0a5c7ebbe55853989d01e6538b15a95e7178aca4af05c21'),
-      launchBlock: 0,
-      type: 'ERC4626',
-      depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'STRK')!],
-      additionalInfo: getLooperSettings('STRK', 'ETH', strkVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
-      risk: {
-        riskFactor: _riskFactor,
-        netRisk:
-          _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
-          _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
-        notARisks: getNoRiskTags(_riskFactor)
-      },
-      protocols: [Protocols.VESU],
-      maxTVL: Web3Number.fromWei(0, 18),
-      contractDetails: getContractDetails(strkVaultSettings),
-      faqs: getFAQs(),
-      investmentSteps: investmentSteps,
-      auditUrl: AUDIT_URL,
-    },
-    {
-      name: "USDT Evergreen",
-      description: getDescription('USDT', ['vesu']),
-      address: ContractAddr.from('0x1c4933d1880c6778585e597154eaca7b428579d72f3aae425ad2e4d26c6bb3'),
-      launchBlock: 0,
-      type: 'ERC4626',
-      depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'USDT')!],
-      additionalInfo: getLooperSettings('USDT', 'ETH', usdtVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
-      risk: {
-        riskFactor: _riskFactor,
-        netRisk:
-          _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
-          _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
-        notARisks: getNoRiskTags(_riskFactor)
-      },
-      protocols: [Protocols.VESU],
-      maxTVL: Web3Number.fromWei(0, 6),
-      contractDetails: getContractDetails(usdtVaultSettings),
-      faqs: getFAQs(),
-      investmentSteps: investmentSteps,
-      auditUrl: AUDIT_URL,
-    }
-  ]
+// const investmentSteps: string[] = [
+//   "Deposit funds into the vault",
+//   "Vault manager allocates funds to optimal yield sources",
+//   "Vault manager reports asset under management (AUM) regularly to the vault",
+//   "Request withdrawal and vault manager processes it in 1-2 hours"
+// ]
+
+// const AUDIT_URL = 'https://docs.troves.fi/p/security#starknet-vault-kit'
+// export const UniversalStrategies: IStrategyMetadata<UniversalStrategySettings>[] =
+//   [
+//     {
+//       name: "USDC Evergreen",
+//       description: getDescription('USDC', ['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),
+//       risk: {
+//         riskFactor: _riskFactor,
+//         netRisk:
+//           _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
+//           _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
+//         notARisks: getNoRiskTags(_riskFactor)
+//       },
+//       auditUrl: AUDIT_URL,
+//       protocols: [Protocols.VESU],
+//       maxTVL: Web3Number.fromWei(0, 6),
+//       contractDetails: getContractDetails(usdcVaultSettings),
+//       faqs: getFAQs(),
+//       investmentSteps: investmentSteps,
+//     },
+//     {
+//       name: "WBTC Evergreen",
+//       description: getDescription('WBTC', ['vesu', 'endur', 'extended']),
+//       address: ContractAddr.from('0x5a4c1651b913aa2ea7afd9024911603152a19058624c3e425405370d62bf80c'),
+//       launchBlock: 0,
+//       type: 'ERC4626',
+//       depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!],
+//       additionalInfo: getLooperSettings('WBTC', 'ETH', wbtcVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
+//       risk: {
+//         riskFactor: _riskFactor,
+//         netRisk:
+//           _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
+//           _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
+//         notARisks: getNoRiskTags(_riskFactor)
+//       },
+//       protocols: [Protocols.VESU],
+//       maxTVL: Web3Number.fromWei(0, 8),
+//       contractDetails: getContractDetails(wbtcVaultSettings),
+//       faqs: getFAQs(),
+//       investmentSteps: investmentSteps,
+//       auditUrl: AUDIT_URL,
+//     },
+//     {
+//       name: "ETH Evergreen",
+//       description: getDescription('ETH', ['vesu', 'extended']),
+//       address: ContractAddr.from('0x446c22d4d3f5cb52b4950ba832ba1df99464c6673a37c092b1d9622650dbd8'),
+//       launchBlock: 0,
+//       type: 'ERC4626',
+//       depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'ETH')!],
+//       additionalInfo: getLooperSettings('ETH', 'WBTC', ethVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
+//       risk: {
+//         riskFactor: _riskFactor,
+//         netRisk:
+//           _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
+//           _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
+//         notARisks: getNoRiskTags(_riskFactor)
+//       },
+//       protocols: [Protocols.VESU],
+//       maxTVL: Web3Number.fromWei(0, 18),
+//       contractDetails: getContractDetails(ethVaultSettings),
+//       faqs: getFAQs(),
+//       investmentSteps: investmentSteps,
+//       auditUrl: AUDIT_URL,
+//     },
+//     {
+//       name: "STRK Evergreen",
+//       description: getDescription('STRK', ['vesu', 'endur', 'extended']),
+//       address: ContractAddr.from('0x55d012f57e58c96e0a5c7ebbe55853989d01e6538b15a95e7178aca4af05c21'),
+//       launchBlock: 0,
+//       type: 'ERC4626',
+//       depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'STRK')!],
+//       additionalInfo: getLooperSettings('STRK', 'ETH', strkVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
+//       risk: {
+//         riskFactor: _riskFactor,
+//         netRisk:
+//           _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
+//           _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
+//         notARisks: getNoRiskTags(_riskFactor)
+//       },
+//       protocols: [Protocols.VESU],
+//       maxTVL: Web3Number.fromWei(0, 18),
+//       contractDetails: getContractDetails(strkVaultSettings),
+//       faqs: getFAQs(),
+//       investmentSteps: investmentSteps,
+//       auditUrl: AUDIT_URL,
+//     },
+//     {
+//       name: "USDT Evergreen",
+//       description: getDescription('USDT', ['vesu']),
+//       address: ContractAddr.from('0x1c4933d1880c6778585e597154eaca7b428579d72f3aae425ad2e4d26c6bb3'),
+//       launchBlock: 0,
+//       type: 'ERC4626',
+//       depositTokens: [Global.getDefaultTokens().find(token => token.symbol === 'USDT')!],
+//       additionalInfo: getLooperSettings('USDT', 'ETH', usdtVaultSettings, VesuPools.Genesis, VesuPools.Genesis),
+//       risk: {
+//         riskFactor: _riskFactor,
+//         netRisk:
+//           _riskFactor.reduce((acc, curr) => acc + curr.value * curr.weight, 0) /
+//           _riskFactor.reduce((acc, curr) => acc + curr.weight, 0),
+//         notARisks: getNoRiskTags(_riskFactor)
+//       },
+//       protocols: [Protocols.VESU],
+//       maxTVL: Web3Number.fromWei(0, 6),
+//       contractDetails: getContractDetails(usdtVaultSettings),
+//       faqs: getFAQs(),
+//       investmentSteps: investmentSteps,
+//       auditUrl: AUDIT_URL,
+//     }
+//   ]