@strkfarm/sdk 2.0.0-dev.34 → 2.0.0-dev.36

package/src/strategies/universal-lst-muliplier-strategy.tsx

@@ -3,7 +3,7 @@ import { AUMTypes, getContractDetails, UNIVERSAL_MANAGE_IDS, UniversalManageCall
 import { PricerBase } from "@/modules/pricerBase";
 import { ContractAddr, Web3Number } from "@/dataTypes";
 import { Global } from "@/global";
-import { ApproveCallParams, APYType, AvnuSwapCallParams, BaseAdapterConfig, CommonAdapter, ManageCall, PositionInfo, TokenTransferAdapter, VesuMultiplyAdapter, VesuPools, VesuSupplyOnlyAdapter } from "./universal-adapters";
+import { ApproveCallParams, APYType, AvnuSwapCallParams, BaseAdapterConfig, CommonAdapter, ManageCall, PositionInfo, TokenTransferAdapter, VesuModifyPositionAdapter, VesuMultiplyAdapter, VesuPools, VesuSupplyOnlyAdapter } from "./universal-adapters";
 import { AVNU_EXCHANGE } from "./universal-adapters/adapter-utils";
 import { DepegRiskLevel, LiquidationRiskLevel, SmartContractRiskLevel, TechnicalRiskLevel } from "@/interfaces/risks";
 import { AvnuWrapper, EkuboQuoter, ERC20, LSTAPRService, PricerFromApi, PricerLST } from "@/modules";
@@ -14,16 +14,40 @@ import { Call, Contract, uint256 } from "starknet";
 import ERC4626Abi from "@/data/erc4626.abi.json";
 import { AdapterOptimizer } from "./universal-adapters/adapter-optimizer";
 import { LSTPriceType } from "./types";
-import { MINIMUM_WBTC_DIFFERENCE_FOR_AVNU_SWAP } from "./vesu-extended-strategy/utils/constants";
-import { VesuExtendedStrategySettings } from "./vesu-extended-strategy/vesu-extended-strategy";
 
 export interface HyperLSTStrategySettings extends UniversalStrategySettings {
-  borrowable_assets: TokenInfo[];
+  borrowable_assets: { tokenInfo: TokenInfo, poolId: ContractAddr }[];
   underlyingToken: TokenInfo;
   quoteAmountToFetchPrice: Web3Number;
   targetHealthFactor: number;
   minHealthFactor: number;
   aumOracle: ContractAddr;
+  adapterIds?: {
+    /** VesuMultiplyAdapter for underlying-matched debt (first matching borrowable pool) */
+    primaryMultiply: string;
+    multiply: Record<string, string>;
+    modify: Record<string, string>;
+  };
+}
+
+function getHyperLSTAdapterKey(debtSymbol: string, poolId: ContractAddr): string {
+  return `${debtSymbol.toLowerCase()}_${poolId.shortString()}`;
+}
+
+function getHyperLSTMultiplyAdapterId(
+  lstSymbol: string,
+  debtSymbol: string,
+  poolId: ContractAddr,
+): string {
+  return `vesu_multiply_${lstSymbol.toLowerCase()}_${getHyperLSTAdapterKey(debtSymbol, poolId)}`;
+}
+
+function getHyperLSTModifyAdapterId(
+  lstSymbol: string,
+  debtSymbol: string,
+  poolId: ContractAddr,
+): string {
+  return `vesu_modify_${lstSymbol.toLowerCase()}_${getHyperLSTAdapterKey(debtSymbol, poolId)}`;
 }
 
 export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings> extends SVKStrategy<S> {
@@ -34,12 +58,10 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     super(config, pricer, metadata);
     const STRKToken = Global.getDefaultTokens().find(token => token.symbol === 'STRK')!;
     const underlyingToken = this.getLSTUnderlyingTokenInfo();
-    if (underlyingToken.address.eq(STRKToken.address)) {
-      this.quoteAmountToFetchPrice = new Web3Number(100, 18);
-    } else {
-      // else this BTC
-      this.quoteAmountToFetchPrice = new Web3Number(0.01, this.asset().decimals);
+    if (metadata.additionalInfo.quoteAmountToFetchPrice.isZero()) {
+      throw new Error(`${this.getTag()}::quoteAmountToFetchPrice is zero`);
     }
+    this.quoteAmountToFetchPrice = metadata.additionalInfo.quoteAmountToFetchPrice;
 
     this.metadata.additionalInfo.adapters.forEach(adapter => {
       adapter.adapter.config.networkConfig = this.config;
@@ -55,13 +77,36 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     return `${UniversalLstMultiplierStrategy.name}:${this.metadata.name}`;
   }
 
-  // Vesu adapter with LST and base token match
-  getVesuSameTokenAdapter() {
-    const vesuMultipleAdapters = this.getVesuAdapters();
-    console.log(vesuMultipleAdapters.map(adapter => adapter.config.debt.symbol));
-    const baseAdapter = vesuMultipleAdapters.find((adapter) => {
-      return adapter.config.debt.address.eq(this.metadata.additionalInfo.underlyingToken.address);
-    })
+  private getAdapterById<T>(id: string): T {
+    const entry = this.metadata.additionalInfo.adapters.find((a) => a.id === id);
+    if (!entry) {
+      throw new Error(`${this.getTag()}::getAdapterById: adapter not found for id "${id}"`);
+    }
+    return entry.adapter as T;
+  }
+
+  getVesuMultiplyAdapterByKey(key: string): VesuMultiplyAdapter {
+    const id = this.metadata.additionalInfo.adapterIds?.multiply[key];
+    if (!id) {
+      throw new Error(`${this.getTag()}::getVesuMultiplyAdapterByKey: unknown key "${key}"`);
+    }
+    return this.getAdapterById<VesuMultiplyAdapter>(id);
+  }
+
+  // Vesu multiply adapter whose debt matches the LST underlying (e.g. STRK for xSTRK)
+  getVesuSameTokenAdapter(): VesuMultiplyAdapter {
+    const primaryId = this.metadata.additionalInfo.adapterIds?.primaryMultiply;
+    if (primaryId) {
+      const adapter = this.getAdapterById<VesuMultiplyAdapter>(primaryId);
+      adapter.config.networkConfig = this.config;
+      adapter.config.pricer = this.pricer;
+      adapter._vesuAdapter.networkConfig = this.config;
+      adapter._vesuAdapter.pricer = this.pricer;
+      return adapter;
+    }
+    const baseAdapter = this.getVesuMultiplyAdapters().find((adapter) =>
+      adapter.config.debt.address.eq(this.metadata.additionalInfo.underlyingToken.address),
+    );
     if (!baseAdapter) {
       throw new Error(`${this.getTag()}::getVesuSameTokenAdapter: base adapter not found`);
     }
@@ -72,7 +117,7 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
 
   // only one leg is used
   // todo support lending assets of underlying as well (like if xSTRK looping is not viable, simply supply STRK)
-  getVesuAdapters() {
+  getVesuMultiplyAdapters() {
     const vesuMultipleAdapters = this.metadata.additionalInfo.adapters
     .filter(adapter => adapter.adapter.name === VesuMultiplyAdapter.name)
     .map(adapter => adapter.adapter) as VesuMultiplyAdapter[]
@@ -90,26 +135,6 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     return Web3Number.fromWei("0", lstToken.decimals);
   }
 
-  async getLSTDexPrice() {
-    const ekuboQuoter = new EkuboQuoter(this.config, this.pricer);
-    const lstTokenInfo = this.asset();
-    const lstUnderlyingTokenInfo = this.getLSTUnderlyingTokenInfo();
-    const quote = await ekuboQuoter.getQuoteExactInput(
-      lstTokenInfo.address.address,
-      lstUnderlyingTokenInfo.address.address,
-      this.quoteAmountToFetchPrice,
-    );
-
-    const outputAmount = Web3Number.fromWei(
-      quote.total_calculated,
-      lstUnderlyingTokenInfo.decimals,
-    );
-    const price =
-      outputAmount.toNumber() / this.quoteAmountToFetchPrice.toNumber();
-    logger.verbose(`${this.getTag()}:: LST Dex Price: ${price}`);
-    return price;
-  }
-
   async getLSTAvnuRate() {
     const vesuAdapter1 = this.getVesuSameTokenAdapter();
     const lstTokenInfo = vesuAdapter1._vesuAdapter.config.collateral;
@@ -471,7 +496,7 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     logger.verbose(`${this.getTag()}::getFundManagementCall params: ${JSON.stringify(params)}`);
     // const legLTV = await vesuAdapter1.getLTVConfig(this.config);
     // logger.verbose(`${this.getTag()}::getVesuMultiplyCall legLTV: ${legLTV}`);
-    const allAdapters = this.metadata.additionalInfo.adapters.map(adapter => adapter.adapter);
+    const multiplyAdapters = this.getVesuMultiplyAdapters();
     if (!params.isDeposit) {
       // try using unused balance to unwind.
       // no need to unwind.
@@ -479,26 +504,12 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
       logger.verbose(`${this.getTag()}::getVesuMultiplyCall unusedBalance: ${unusedBalance.amount.toString()}, required: ${params.leg1DepositAmount.toString()}`);
       if (unusedBalance.amount.gte(params.leg1DepositAmount)) {
         return null;
-      } else {
-        const adapters = await AdapterOptimizer.getAdapterToUse(allAdapters, false, params.leg1DepositAmount);
-        if (adapters.length > 0) {
-          const proofsInfo = adapters.map(adapter => adapter.getProofs(false, this.getMerkleTree()));
-          const calls: Call[] = [];
-          for (const info of proofsInfo) {
-            const manageCalls = await info.callConstructor({ amount: params.leg1DepositAmount });
-            const call = this.getManageCall(this.getProofGroupsForManageCalls(manageCalls), manageCalls);
-            calls.push(call);
-          }
-          return calls;
-        } else {
-          throw new Error(`${this.getTag()}::getVesuMultiplyCall: no adapters to use for unused balance: ${unusedBalance.amount.toString()}`);
-        }
       }
     }
 
-    const adapters = await AdapterOptimizer.getAdapterToUse(allAdapters, true, params.leg1DepositAmount);
+    const adapters = await AdapterOptimizer.getAdapterToUse(multiplyAdapters, params.isDeposit, params.leg1DepositAmount);
     if (adapters.length > 0) {
-      const proofsInfo = adapters.map(adapter => adapter.getProofs(true, this.getMerkleTree()));
+      const proofsInfo = adapters.map(adapter => adapter.getProofs(params.isDeposit, this.getMerkleTree()));
       const calls: Call[] = [];
       for (const info of proofsInfo) {
         const manageCalls = await info.callConstructor({ amount: params.leg1DepositAmount });
@@ -509,73 +520,15 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     } else {
       throw new Error(`${this.getTag()}::getVesuMultiplyCall: no adapters to use for deposit: ${params.leg1DepositAmount.toString()}`);
     }
-
-    // const existingPositions = await vesuAdapter1.getPositions(this.config);
-    // const collateralisation = await vesuAdapter1.getCollateralization(this.config);
-    // const existingCollateralInfo = existingPositions[0];
-    // const existingDebtInfo = existingPositions[1];
-    // logger.debug(`${this.getTag()}::getVesuMultiplyCall existingCollateralInfo: ${JSON.stringify(existingCollateralInfo)},
-    // existingDebtInfo: ${JSON.stringify(existingDebtInfo)}, collateralisation: ${JSON.stringify(collateralisation)}`);
-
-    // // - Prices as seen by Vesu contracts, ideal for HF math
-    // // Price 1 is ok as fallback bcz that would relatively price the
-    // // collateral and debt as equal.
-    // const collateralPrice = collateralisation[0].usdValue > 0 ? collateralisation[0].usdValue / existingCollateralInfo.amount.toNumber() : 1;
-    // const debtPrice = collateralisation[1].usdValue > 0 ? collateralisation[1].usdValue / existingDebtInfo.amount.toNumber() : 1;
-    // logger.debug(`${this.getTag()}::getVesuMultiplyCall collateralPrice: ${collateralPrice}, debtPrice: ${debtPrice}`);
-
-    // // - Prices as seen by actual swap price
-    // const dexPrice = await this.getLSTDexPrice();
-
-    // // compute optimal amount of collateral and debt post addition/removal
-    // // target hf = collateral * collateralPrice * ltv / debt * debtPrice
-    // // assuming X to be the usd amount of debt borrowed or repaied (negative).
-    // // target hf = (((collateral + legDepositAmount) * collateralPrice + X)) * ltv / (debt * debtPrice + X)
-    // // => X * target hf = (((collateral + legDepositAmount) * collateralPrice + X)) * ltv - (debt * debtPrice * target hf)
-    // // => X * (target hf - ltv)= ((collateral + legDepositAmount) * collateralPrice * ltv) - (debt * debtPrice * target hf)
-    // // => X = (((collateral + legDepositAmount) * collateralPrice * ltv) - (debt * debtPrice * target hf)) / (target hf - ltv)
-    // const addedCollateral = params.leg1DepositAmount
-    //   .multipliedBy(params.isDeposit ? 1 : -1)
-    // logger.verbose(`${this.getTag()}::getVesuMultiplyCall addedCollateral: ${addedCollateral}`);
-    // const numeratorPart1 = (existingCollateralInfo.amount.plus((addedCollateral))).multipliedBy(collateralPrice).multipliedBy(legLTV);
-    // logger.verbose(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}`);
-    // const numeratorPart2 = existingDebtInfo.amount.multipliedBy(debtPrice).multipliedBy(this.metadata.additionalInfo.targetHealthFactor);
-    // logger.verbose(`${this.getTag()}::getVesuMultiplyCall numeratorPart2: ${numeratorPart2}`);
-    // const denominatorPart = this.metadata.additionalInfo.targetHealthFactor - (legLTV / dexPrice);
-    // logger.verbose(`${this.getTag()}::getVesuMultiplyCall denominatorPart: ${denominatorPart}`);
-    // const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
-    // logger.verbose(`${this.getTag()}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
-    // logger.debug(`${this.getTag()}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
-
-    // // both in underlying
-    // const debtAmount = x_debt_usd.dividedBy(debtPrice);
-    // const marginAmount = addedCollateral;
-    // logger.verbose(`${this.getTag()}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
-
-    // // Cases of lever increase (within the scopr of this function)
-    // // 1. debtAmount > 0 and marginAmount > 0
-    // // 2. debtAmount > 0 and marginAmount < 0
-
-    // // Cases of lever decrease
-    // // 3. debtAmount < 0 and marginAmount > 0
-    // // 4. debtAmount < 0 and marginAmount < 0
-    // return this.getModifyLeverCall({
-    //   marginAmount,
-    //   debtAmount,
-    //   lstDexPriceInUnderlying: dexPrice,
-    //   isIncrease: debtAmount.greaterThan(0)
-    // });
   }
 
-
   getLSTUnderlyingTokenInfo() {
     return this.metadata.additionalInfo.underlyingToken;
   }
 
   async getLSTAPR(_address: ContractAddr): Promise<number> {
     try {
-      const vesuAdapter1 = this.getVesuSameTokenAdapter();
-      const apr = await LSTAPRService.getLSTAPR(vesuAdapter1._vesuAdapter.config.debt.address);
+      const apr = await LSTAPRService.getLSTAPR(this.getLSTUnderlyingTokenInfo().address);
       if (!apr) {
         throw new Error('Failed to get LST APR');
       }
@@ -598,6 +551,7 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
       logger.verbose(
         `${this.getTag()}::netAPY: unused balance is > max servicable from loan, lstAPY: ${lstAPY}`,
       );
+      // TODO, need to add the unused balance APY
       const output = await super.netAPY();
       output.splits.push({ apy: lstAPY, id: "lst_apy" });
       return output;
@@ -615,12 +569,9 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     params: { isAPYComputation: boolean } = { isAPYComputation: false },
   ) {
     let numerator = 0;
-    for (let adapter of this.getVesuAdapters()) {
+    for (let adapter of this.getVesuMultiplyAdapters()) {
       const maxDepositInfo = await adapter.maxDeposit();
-      const ltv = await adapter._vesuAdapter.getLTVConfig(this.config);
-      numerator +=
-        (this.metadata.additionalInfo.targetHealthFactor *
-          maxDepositInfo.amount.toNumber()) / ltv;
+      numerator += maxDepositInfo.amount.toNumber();
     }
     return numerator;
   }
@@ -639,45 +590,46 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     const underlying = this.asset();
     assert(underlying.symbol.startsWith('x'), 'Underlying is not an LST of Endur');
 
+    // dynamic computation of aum based on price type
     const priceType = unrealizedAUM ? LSTPriceType.ENDUR_PRICE : LSTPriceType.AVNU_PRICE;
 
+    // get dex rate
     let tokenUnderlyingPrice: number;
+    const avnuRate = await this.getLSTAvnuRate();
+    if (avnuRate === 0) {
+      throw new Error(`${this.getTag()}::getAUM: tokenUnderlyingPrice (Avnu) is 0`);
+    }
+
+    // get token underlying price
     if (priceType === LSTPriceType.ENDUR_PRICE) {
       tokenUnderlyingPrice = await this.getLSTExchangeRate();
       if (tokenUnderlyingPrice === 0) {
         throw new Error(`${this.getTag()}::getAUM: tokenUnderlyingPrice (Endur) is 0`);
       }
-      const avnuRate = await this.getLSTAvnuRate();
-      if (avnuRate === 0) {
-        throw new Error(`${this.getTag()}::getAUM: tokenUnderlyingPrice (Avnu) is 0`);
-      }
-      const diff = Math.abs(tokenUnderlyingPrice - avnuRate) / tokenUnderlyingPrice;
-      if (diff > 0.02) {
-        throw new Error(
-          `${this.getTag()}::getAUM: Endur and Avnu prices differ by more than 2% (Endur: ${tokenUnderlyingPrice}, Avnu: ${avnuRate})`,
-        );
-      }
-      logger.verbose(`${this.getTag()} tokenUnderlyingPrice (Endur): ${tokenUnderlyingPrice}, avnuRate: ${avnuRate}, diff: ${diff}`);
     } else {
-      tokenUnderlyingPrice = await this.getLSTAvnuRate();
-      if (tokenUnderlyingPrice === 0) {
-        throw new Error(`${this.getTag()}::getAUM: tokenUnderlyingPrice (Avnu) is 0`);
-      }
-      logger.verbose(`${this.getTag()} tokenUnderlyingPrice (Avnu): ${tokenUnderlyingPrice}`);
+      tokenUnderlyingPrice = avnuRate;
     }
 
-    const allPositions: PositionInfo[] = [];
-    for (let adapter of this.metadata.additionalInfo.adapters) {
-      const positions = await adapter.adapter.getPositions();
-      allPositions.push(...positions);
+    // check if endur and avnu prices differ by more than 2%
+    const diff = Math.abs(tokenUnderlyingPrice - avnuRate) / tokenUnderlyingPrice;
+    if (diff > 0.02) {
+      throw new Error(
+        `${this.getTag()}::getAUM: Endur and Avnu prices differ by more than 2% (Endur: ${tokenUnderlyingPrice}, Avnu: ${avnuRate})`,
+      );
     }
 
+    // get all positions
+    const allPositions = await this.getVaultPositions();
+
+    // compute net aum
     let netAUM = new Web3Number(0, underlying.decimals);
     for (let position of allPositions) {
-      if (position.tokenInfo.address.eq(underlying.address)) {
+      if (position.token.address.eq(underlying.address)) {
         netAUM = netAUM.plus(position.amount);
-      } else {
+      } else if (position.token.address.eq(this.getLSTUnderlyingTokenInfo().address)) {
         netAUM = netAUM.plus(position.amount.dividedBy(tokenUnderlyingPrice));
+      } else {
+        throw new Error(`${this.getTag()}::getAUM: unknown token: ${position.token.symbol}`);
       }
     }
 
@@ -690,7 +642,7 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
       tokenInfo: underlying,
       amount: netAUM,
       usdValue: netAUM.toNumber() * assetPrice.price,
-      apy: {apy: netAUM.toNumber() * assetPrice.price, type: APYType.BASE},
+      apy: {apy: 0, type: APYType.BASE}, // VT: Dont remember why this field exists here. FOr now, set it to 0.
       remarks: AUMTypes.FINALISED,
       protocol: Protocols.NONE
     };
@@ -730,26 +682,6 @@ export class UniversalLstMultiplierStrategy<S extends HyperLSTStrategySettings>
     };
   }
 
-  /**
-   *
-   * @param params marginAmount is in LST, debtAmount is in underlying
-   */
-  // async getModifyLeverCall(params: {
-  //   marginAmount: Web3Number, // >0 during deposit
-  //   debtAmount: Web3Number,
-  //   lstDexPriceInUnderlying: number,
-  //   isIncrease: boolean
-  // }): Promise<Call[]> {
-  //   logger.verbose(`${this.getTag()}::getModifyLeverCall marginAmount: ${params.marginAmount}, debtAmount: ${params.debtAmount}, lstDexPriceInUnderlying: ${params.lstDexPriceInUnderlying}, isIncrease: ${params.isIncrease}`);
-
-  //   const vesuAdapter = this.getVesuSameTokenAdapter();
-  //   const manage0Info = vesuAdapter.
-  //   const manageCall0 = manage0Info.callConstructor({
-  //     amount: newDepositAmount
-  //   });
-  //   const manageCalls = await vesu
-  //   return [this.getManageCall(proofsIDs, manageCalls)];
-  // }
 }
 
 export default function VaultDescription(
@@ -802,74 +734,82 @@ function getDescription(tokenSymbol: string, underlyingSymbol: string) {
   return VaultDescription(tokenSymbol, underlyingSymbol);
 }
 
-
-enum LST_MULTIPLIER_MANAGE_IDS  {
-  MULTIPLE_APPROVE = 'multiple_approve',
-  MULTIPLY_VESU = 'multiply_vesu',
-  SWITCH_DELEGATION_ON = 'switch_delegation_on',
-  SWITCH_DELEGATION_OFF = 'switch_delegation_off',
-  AVNU_MULTIPLY_APPROVE_DEPOSIT = 'avnu_mul_approve_dep',
-  AVNU_MULTIPLY_SWAP_DEPOSIT = 'avnu_mul_swap_dep',
-  AVNU_MULTIPLY_APPROVE_WITHDRAW = 'avnu_mul_approve_withdr',
-  AVNU_MULTIPLY_SWAP_WITHDRAW = 'avnu_mul_swap_withdr',
-}
-
-function getAvnuManageIDs(baseID: LST_MULTIPLIER_MANAGE_IDS, debtTokenSymbol: string) {
-  return `${baseID}_${debtTokenSymbol.toLowerCase()}`;
-}
-
-function getVesuLegId(baseID: string, debtTokenSymbol: string) {
-  return `${baseID}_${debtTokenSymbol.toLowerCase()}`;
-}
-
 function getLooperSettings(
   lstSymbol: string,
   underlyingSymbol: string,
   vaultSettings: HyperLSTStrategySettings,
-  pool1: ContractAddr,
 ) {
   vaultSettings.leafAdapters = [];
+  vaultSettings.adapters = [];
 
   const lstToken = Global.getDefaultTokens().find(token => token.symbol === lstSymbol)!;
   const underlyingToken = Global.getDefaultTokens().find(token => token.symbol === underlyingSymbol)!;
 
   const baseAdapterConfig: BaseAdapterConfig = {
     baseToken: lstToken,
-    supportedPositions: [{asset: lstToken, isDebt: false}],
+    supportedPositions: [{asset: lstToken, isDebt: false}, {asset: underlyingToken, isDebt: true}],
     networkConfig: getMainnetConfig(),
     pricer: new PricerFromApi(getMainnetConfig(), Global.getDefaultTokens()),
     vaultAllocator: vaultSettings.vaultAllocator,
     vaultAddress: vaultSettings.vaultAddress
   }
-  const vesuAdapterLST = new VesuSupplyOnlyAdapter({
-    // xWBTC vToken on re7 xBTC pool
-    vTokenContract: ContractAddr.from('0x062a162d0827db6f43ebb850cbef3c99fc7969e3070b83a2236c9f3713c89fd8'),
-    ...baseAdapterConfig,
-  })
 
-  const vesuMultiplyAdapters = borrowableAssets.map(position => new VesuMultiplyAdapter({
-    poolId: pool1,
-    collateral: lstToken,
-    debt: Global.getDefaultTokens().find(token => token.symbol === position)!,
-    marginToken: lstToken,
-    targetHealthFactor: vaultSettings.targetHealthFactor,
-    minHealthFactor: vaultSettings.minHealthFactor,
-    quoteAmountToFetchPrice: vaultSettings.quoteAmountToFetchPrice,
-    ...baseAdapterConfig,
-    supportedPositions: [{asset: lstToken, isDebt: false}, {asset: Global.getDefaultTokens().find(token => token.symbol === position)!, isDebt: true}],
-    minimumVesuMovementAmount: 0
-  }));
-
-  // Tracks LST balance in the vault allocator; fromAddress=vaultAllocator, toAddress=vaultAddress
-  const lstTransferAdapter = new TokenTransferAdapter({
-    ...baseAdapterConfig,
-    fromAddress: vaultSettings.vaultAllocator,
-    toAddress: vaultSettings.vaultAddress,
+  const adapterIds: NonNullable<HyperLSTStrategySettings["adapterIds"]> = {
+    primaryMultiply: "",
+    multiply: {},
+    modify: {},
+  };
+
+  const vesuMultiplyAdapters = vaultSettings.borrowable_assets.map((position) => {
+    const key = getHyperLSTAdapterKey(position.tokenInfo.symbol, position.poolId);
+    const id = getHyperLSTMultiplyAdapterId(lstSymbol, position.tokenInfo.symbol, position.poolId);
+    adapterIds.multiply[key] = id;
+    return {
+      id,
+      adapter: new VesuMultiplyAdapter({
+        poolId: position.poolId,
+        collateral: lstToken,
+        debt: position.tokenInfo,
+        marginToken: lstToken,
+        targetHealthFactor: vaultSettings.targetHealthFactor,
+        minHealthFactor: vaultSettings.minHealthFactor,
+        quoteAmountToFetchPrice: vaultSettings.quoteAmountToFetchPrice,
+        ...baseAdapterConfig,
+        minimumVesuMovementAmount: 0,
+      }),
+    };
   });
 
-  vaultSettings.adapters.push({id: `${vesuAdapterLST.name}_${lstToken.symbol}_${underlyingToken.symbol}`, adapter: vesuAdapterLST});
-  vesuMultiplyAdapters.map(adapter => vaultSettings.adapters.push({id: `${adapter.name}_${lstToken.symbol}_${underlyingToken.symbol}`, adapter: adapter}));
-  vaultSettings.adapters.push({id: `${lstTransferAdapter.name}_${lstToken.symbol}`, adapter: lstTransferAdapter});
+  const vesuModifyPositionAdapters = vaultSettings.borrowable_assets.map((position) => {
+    const key = getHyperLSTAdapterKey(position.tokenInfo.symbol, position.poolId);
+    const id = getHyperLSTModifyAdapterId(lstSymbol, position.tokenInfo.symbol, position.poolId);
+    adapterIds.modify[key] = id;
+    return {
+      id,
+      adapter: new VesuModifyPositionAdapter({
+        poolId: position.poolId,
+        collateral: lstToken,
+        debt: position.tokenInfo,
+        targetLtv: 0.8,
+        maxLtv: 0.9,
+        ...baseAdapterConfig,
+      }),
+    };
+  });
+
+  if (!adapterIds.primaryMultiply && vesuMultiplyAdapters.length > 0) {
+    adapterIds.primaryMultiply = vesuMultiplyAdapters[0].id;
+  } else {
+    throw new Error(`${lstSymbol}::getLooperSettings: primaryMultiply adapter not found`);
+  }
+  vaultSettings.adapterIds = adapterIds;
+
+  for (const entry of vesuMultiplyAdapters) {
+    vaultSettings.adapters.push(entry);
+  }
+  for (const entry of vesuModifyPositionAdapters) {
+    vaultSettings.adapters.push(entry);
+  }
 
   const commonAdapter = new CommonAdapter({
     id: UNIVERSAL_MANAGE_IDS.FLASH_LOAN,
@@ -879,25 +819,21 @@ function getLooperSettings(
     asset: lstToken.address
   })
 
-  // push vesu adapter to leaf adapters
-  vaultSettings.leafAdapters.push(() => vesuAdapterLST.getDepositLeaf());
-  vaultSettings.leafAdapters.push(() => vesuAdapterLST.getWithdrawLeaf());
-
-  // push vesu multiply adapter to leaf adapters
-  vesuMultiplyAdapters.map(adapter => vaultSettings.leafAdapters.push(() => adapter.getDepositLeaf()));
-  vesuMultiplyAdapters.map(adapter => vaultSettings.leafAdapters.push(() => adapter.getWithdrawLeaf()));
+  for (const entry of vesuMultiplyAdapters) {
+    const adapter = entry.adapter;
+    vaultSettings.leafAdapters.push(() => adapter.getDepositLeaf());
+    vaultSettings.leafAdapters.push(() => adapter.getWithdrawLeaf());
+  }
+  for (const entry of vesuModifyPositionAdapters) {
+    const adapter = entry.adapter;
+    vaultSettings.leafAdapters.push(() => adapter.getDepositLeaf());
+    vaultSettings.leafAdapters.push(() => adapter.getWithdrawLeaf());
+  }
 
   // to bridge liquidity back to vault (used by bring_liquidity)
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.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(vesuAdapterLST.getDefispringRewardsAdapter(UNIVERSAL_MANAGE_IDS.DEFISPRING_REWARDS).bind(vesuAdapterLST));
-
-  // // avnu swap for claims rewards
-  // const STRKToken = Global.getDefaultTokens().find(token => token.symbol === 'STRK')!;
-  // vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(STRKToken.address, AVNU_EXCHANGE, UNIVERSAL_MANAGE_IDS.APPROVE_SWAP_TOKEN1).bind(commonAdapter));
-  // vabaseAdapterConfigultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, lstToken.address, UNIVERSAL_MANAGE_IDS.AVNU_SWAP_REWARDS, false).bind(commonAdapter));
   return vaultSettings;
 }
 
@@ -966,10 +902,6 @@ export const _riskFactor: RiskFactor[] = [
   {type: RiskType.DEPEG_RISK, value: DepegRiskLevel.GENERALLY_STABLE, weight: 25, reason: "Generally stable pegged assets" },
 ];
 
-const borrowableAssets = [
-  'WBTC', 'tBTC', 'LBTC', 'solvBTC'
-]
-
 const hyperxSTRK: HyperLSTStrategySettings = {
   vaultAddress: ContractAddr.from('0x46c7a54c82b1fe374353859f554a40b8bd31d3e30f742901579e7b57b1b5960'),
   manager: ContractAddr.from('0x5d499cd333757f461a0bedaca3dfc4d77320c773037e0aa299f22a6dbfdc03a'),
@@ -980,9 +912,15 @@ const hyperxSTRK: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'STRK'),
+  borrowable_assets: [{
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'STRK')!,
+    poolId: VesuPools.Re7STRK,
+  }, {
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'STRK')!,
+    poolId: VesuPools.Prime,
+  }],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'STRK')!,
-  quoteAmountToFetchPrice: new Web3Number('100', Global.getDefaultTokens().find(token => token.symbol === 'STRK')!.decimals),
+  quoteAmountToFetchPrice: new Web3Number('1000', Global.getDefaultTokens().find(token => token.symbol === 'STRK')!.decimals),
 }
 
 const hyperxWBTC: HyperLSTStrategySettings = {
@@ -995,7 +933,10 @@ const hyperxWBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'WBTC'),
+  borrowable_assets: [{
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!,
+    poolId: VesuPools.Re7xBTC,
+  }],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!,
   quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!.decimals),
   redemptionRouter: ContractAddr.from('0x6ea649f402898f69baf775c1afdd08522c071c640b9c4460192070ec2b96417'),
@@ -1011,7 +952,13 @@ const hyperxtBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'tBTC' || token.symbol === 'WBTC'),
+  borrowable_assets: [{
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'tBTC')!,
+    poolId: VesuPools.Re7xBTC,
+  }, {
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!,
+    poolId: VesuPools.Re7xBTC,
+  }],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'tBTC')!,
   quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'tBTC')!.decimals),
   redemptionRouter: ContractAddr.from('0x3de9c409d1e357e25778fb7a3e2e2393666956846a5c2caa607296fa8e76b5d'),
@@ -1027,7 +974,10 @@ const hyperxsBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'solvBTC'),
+  borrowable_assets: [{
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'solvBTC')!,
+    poolId: VesuPools.Re7xBTC,
+  }],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'solvBTC')!,
   quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'solvBTC')!.decimals),
 }
@@ -1042,44 +992,47 @@ const hyperxLBTC: HyperLSTStrategySettings = {
   adapters: [],
   targetHealthFactor: 1.1,
   minHealthFactor: 1.05,
-  borrowable_assets: Global.getDefaultTokens().filter(token => token.symbol === 'LBTC'),
+  borrowable_assets: [{
+    tokenInfo: Global.getDefaultTokens().find(token => token.symbol === 'LBTC')!,
+    poolId: VesuPools.Re7xBTC,
+  }],
   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'LBTC')!,
   quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'LBTC')!.decimals),
 }
 
-const hypermRe7BTC: HyperLSTStrategySettings = {
-  vaultAddress: ContractAddr.from('0x6c89b75d09de82477edb86b2c2918cfc1a5dc0177cfbdea46278386b6499645'),
-  manager: ContractAddr.from('0x7bc2d0535e13352d3ab78ea047616a3162068294297304943d2302122a150a1'),
-  vaultAllocator: ContractAddr.from('0x760f9cebca9d2ee624f4224591da6da8b3ea5fd2410590735709551bd4e7570'),
-  redeemRequestNFT: ContractAddr.from('0x5e045ae0160f7650f8a4dd7c826f25630a89fe62434db4441e7e0075608180f'),
-  aumOracle: ContractAddr.from('0x3958df341b838813c24efb9183c23bddd1c57d44b1b86c0dd57f67887b89fba'),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.1,
-  minHealthFactor: 1.05,
-  borrowable_assets: borrowableAssets.map(asset => Global.getDefaultTokens().find(token => token.symbol === asset)!),
-  underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!,
-  quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'mRe7BTC')!.decimals),
-}
+// const hypermRe7BTC: HyperLSTStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x6c89b75d09de82477edb86b2c2918cfc1a5dc0177cfbdea46278386b6499645'),
+//   manager: ContractAddr.from('0x7bc2d0535e13352d3ab78ea047616a3162068294297304943d2302122a150a1'),
+//   vaultAllocator: ContractAddr.from('0x760f9cebca9d2ee624f4224591da6da8b3ea5fd2410590735709551bd4e7570'),
+//   redeemRequestNFT: ContractAddr.from('0x5e045ae0160f7650f8a4dd7c826f25630a89fe62434db4441e7e0075608180f'),
+//   aumOracle: ContractAddr.from('0x3958df341b838813c24efb9183c23bddd1c57d44b1b86c0dd57f67887b89fba'),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.1,
+//   minHealthFactor: 1.05,
+//   borrowable_assets: .map(asset => Global.getDefaultTokens().find(token => token.symbol === asset)!),
+//   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'WBTC')!,
+//   quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'mRe7BTC')!.decimals),
+// }
 // Contract deployed: Vault, addr: 0x42797ab4eb1f72787442e91a73d63a39e3a141c1106470a946ecc328db6896c
 // Contract deployed: RedeemRequest, addr: 0x4bbb25c2568af07967342833f7db1aece1be1be2330798dab4ee585aa6c2c72
 // Contract deployed: VaultAllocator, addr: 0x456c4c6afca90512aeb5c735d84405fea6e51ab06d1851ac8cdb0a235e14f15
 // Contract deployed: Manager, addr: 0x435b45d40fbb406cf69ac84bb471e7b7a4ea2295d0893c05dd2db565295e77f
 
-const hypermRe7YIELD: HyperLSTStrategySettings = {
-  vaultAddress: ContractAddr.from('0x42797ab4eb1f72787442e91a73d63a39e3a141c1106470a946ecc328db6896c'),
-  manager: ContractAddr.from('0x435b45d40fbb406cf69ac84bb471e7b7a4ea2295d0893c05dd2db565295e77f'),
-  vaultAllocator: ContractAddr.from('0x456c4c6afca90512aeb5c735d84405fea6e51ab06d1851ac8cdb0a235e14f15'),
-  redeemRequestNFT: ContractAddr.from('0x4bbb25c2568af07967342833f7db1aece1be1be2330798dab4ee585aa6c2c72'),
-  aumOracle: ContractAddr.from('0x3e1f2825158cafccc9b42a8165d17ceb6b8e966474d9c63587d338746888382'),
-  leafAdapters: [],
-  adapters: [],
-  targetHealthFactor: 1.1,
-  minHealthFactor: 1.05,
-  borrowable_assets: [Global.getDefaultTokens().find(token => token.symbol === 'USDC')!],
-  underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'USDC')!,
-  quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'mRe7BTC')!.decimals),
-}
+// const hypermRe7YIELD: HyperLSTStrategySettings = {
+//   vaultAddress: ContractAddr.from('0x42797ab4eb1f72787442e91a73d63a39e3a141c1106470a946ecc328db6896c'),
+//   manager: ContractAddr.from('0x435b45d40fbb406cf69ac84bb471e7b7a4ea2295d0893c05dd2db565295e77f'),
+//   vaultAllocator: ContractAddr.from('0x456c4c6afca90512aeb5c735d84405fea6e51ab06d1851ac8cdb0a235e14f15'),
+//   redeemRequestNFT: ContractAddr.from('0x4bbb25c2568af07967342833f7db1aece1be1be2330798dab4ee585aa6c2c72'),
+//   aumOracle: ContractAddr.from('0x3e1f2825158cafccc9b42a8165d17ceb6b8e966474d9c63587d338746888382'),
+//   leafAdapters: [],
+//   adapters: [],
+//   targetHealthFactor: 1.1,
+//   minHealthFactor: 1.05,
+//   borrowable_assets: [Global.getDefaultTokens().find(token => token.symbol === 'USDC')!],
+//   underlyingToken: Global.getDefaultTokens().find(token => token.symbol === 'USDC')!,
+//   quoteAmountToFetchPrice: new Web3Number('0.001', Global.getDefaultTokens().find(token => token.symbol === 'mRe7BTC')!.decimals),
+// }
 
 export function getInvestmentSteps(lstSymbol: string, underlyingSymbol: string) {
   return [
@@ -1199,7 +1152,7 @@ function getStrategySettings(
       description: `Creates leveraged looping position on ${lstSymbol} by borrowing ${underlyingSymbol} to increase yield`,
     },
     depositTokens: [Global.getDefaultTokens().find(token => token.symbol === lstSymbol)!],
-    additionalInfo: getLooperSettings(lstSymbol, underlyingSymbol, settings, lstSymbol === 'xSTRK' ? VesuPools.Re7xSTRK : VesuPools.Re7xBTC),
+    additionalInfo: getLooperSettings(lstSymbol, underlyingSymbol, settings),
     risk: {
       riskFactor: _riskFactor,
       netRisk:
@@ -1219,7 +1172,7 @@ function getStrategySettings(
     investmentSteps: getInvestmentSteps(lstSymbol, underlyingSymbol),
     isPreview: isPreview,
     apyMethodology: 'Current annualized APY in terms of base asset of the LST. There is no additional fee taken by Troves on LST APY. We charge a 10% performance fee on the additional gain which is already accounted in the APY shown.',
-    realizedAPYMethodology: 'The realizedAPY is based on past 14 days performance by the vault',
+    realizedApyMethodology: 'The realizedAPY is based on past 14 days performance by the vault',
     tags: lstSymbol.includes('BTC')
       ? [StrategyTag.BTC, StrategyTag.LEVERED]
       : [StrategyTag.LEVERED],
@@ -1255,10 +1208,10 @@ function getStrategySettings(
 export const HyperLSTStrategies: IStrategyMetadata<HyperLSTStrategySettings>[] =
   [
     getStrategySettings('xSTRK', 'STRK', hyperxSTRK, false, true),
-    getStrategySettings('xWBTC', 'WBTC', hyperxWBTC, false, false),
-    getStrategySettings('xtBTC', 'tBTC', hyperxtBTC, false, false),
-    getStrategySettings('xsBTC', 'solvBTC', hyperxsBTC, false, false),
-    getStrategySettings('xLBTC', 'LBTC', hyperxLBTC, false, false),
-    getStrategySettings('mRe7BTC', 'mRe7BTC', hypermRe7BTC, false, false),
-    getStrategySettings('mRe7YIELD', 'mRe7YIELD', hypermRe7YIELD, false, false),
+    getStrategySettings('xWBTC', 'WBTC', hyperxWBTC, false, true),
+    getStrategySettings('xtBTC', 'tBTC', hyperxtBTC, false, true),
+    getStrategySettings('xsBTC', 'solvBTC', hyperxsBTC, false, true),
+    getStrategySettings('xLBTC', 'LBTC', hyperxLBTC, false, true),
+    // getStrategySettings('mRe7BTC', 'mRe7BTC', hypermRe7BTC, false, false),
+    // getStrategySettings('mRe7YIELD', 'mRe7YIELD', hypermRe7YIELD, false, false),
   ]