@strkfarm/sdk 1.1.28 → 1.1.31

package/dist/index.mjs

@@ -19027,9 +19027,11 @@ import { hash, num as num6, shortString } from "starknet";
 // src/strategies/universal-adapters/adapter-utils.ts
 var SIMPLE_SANITIZER = ContractAddr.from("0x5a2e3ceb3da368b983a8717898427ab7b6daf04014b70f321e777f9aad940b4");
 var SIMPLE_SANITIZER_V2 = ContractAddr.from("0x7b6f98311af8aa425278570e62abf523e6462eaa01a38c1feab9b2f416492e2");
+var VESU_V2_MODIFY_POSITION_SANITIZER = ContractAddr.from("0x04Bf71F2BD9D6F8819057c9dD524F0d5fbc38317C00500d7b9a0FdCf01195066");
 var SIMPLE_SANITIZER_VESU_V1_DELEGATIONS = ContractAddr.from("0x5643d54da70a471cd2b6fa37f52ea7a13cc3f3910689a839f8490a663d2208a");
 var PRICE_ROUTER = ContractAddr.from("0x05e83Fa38D791d2dba8E6f487758A9687FfEe191A6Cf8a6c5761ab0a110DB837");
 var AVNU_MIDDLEWARE = ContractAddr.from("0x4a7972ed3f5d1e74a6d6c4a8f467666953d081c8f2270390cc169d50d17cb0d");
+var AVNU_EXCHANGE = ContractAddr.from("0x04270219d365d6b017231b52e92b3fb5d7c8378b05e9abc97724537a80e93b0f");
 var VESU_SINGLETON = ContractAddr.from("0x000d8d6dfec4d33bfb6895de9f3852143a17c6f92fd2a21da3d6924d34870160");
 function toBigInt(value) {
   if (typeof value === "string") {
@@ -19174,11 +19176,11 @@ var CommonAdapter = class extends BaseAdapter {
       };
     };
   }
-  getAvnuAdapter(fromToken, toToken, id) {
+  getAvnuAdapter(fromToken, toToken, id, isMiddleware) {
     return () => ({
       leaf: this.constructSimpleLeafData({
         id,
-        target: AVNU_MIDDLEWARE,
+        target: isMiddleware ? AVNU_MIDDLEWARE : AVNU_EXCHANGE,
         method: "multi_route_swap",
         packedArguments: [
           fromToken.toBigInt(),
@@ -19186,15 +19188,15 @@ var CommonAdapter = class extends BaseAdapter {
           this.config.vaultAllocator.toBigInt()
         ]
       }),
-      callConstructor: this.getAvnuCall(fromToken, toToken).bind(this)
+      callConstructor: this.getAvnuCall(fromToken, toToken, isMiddleware).bind(this)
     });
   }
-  getAvnuCall(fromToken, toToken) {
+  getAvnuCall(fromToken, toToken, isMiddleware) {
     return (params) => {
       return {
         sanitizer: SIMPLE_SANITIZER,
         call: {
-          contractAddress: AVNU_MIDDLEWARE,
+          contractAddress: isMiddleware ? AVNU_MIDDLEWARE : AVNU_EXCHANGE,
           selector: hash2.getSelectorFromName("multi_route_swap"),
           calldata: [
             fromToken.toBigInt(),
@@ -23948,24 +23950,30 @@ var VesuAdapter = class _VesuAdapter extends BaseAdapter {
     this.VESU_MULTIPLY = ContractAddr.from("0x027fef272d0a9a3844767c851a64b36fe4f0115141d81134baade95d2b27b781");
     this.getModifyPosition = () => {
       const positionData = [0n];
-      const packedArguments = [
-        toBigInt(this.config.poolId.toString()),
-        // pool id
+      const { addr, isV2 } = getVesuSingletonAddress(this.config.poolId);
+      const commonPackedData = [
         toBigInt(this.config.collateral.address.toString()),
         // collateral
         toBigInt(this.config.debt.address.toString()),
         // debt
-        toBigInt(this.config.vaultAllocator.toString()),
+        toBigInt(this.config.vaultAllocator.toString())
         // vault allocator
+      ];
+      const packedArguments = isV2 ? [
+        ...commonPackedData
+      ] : [
+        toBigInt(this.config.poolId.toString()),
+        // pool id
+        ...commonPackedData,
         toBigInt(positionData.length),
         ...positionData
       ];
       const output = this.constructSimpleLeafData({
         id: this.config.id,
-        target: getVesuSingletonAddress(this.config.poolId).addr,
+        target: addr,
         method: "modify_position",
         packedArguments
-      });
+      }, isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER);
       return { leaf: output, callConstructor: this.getModifyPositionCall.bind(this) };
     };
     this.getModifyPositionCall = (params) => {
@@ -24006,7 +24014,7 @@ var VesuAdapter = class _VesuAdapter extends BaseAdapter {
         }
       });
       return {
-        sanitizer: SIMPLE_SANITIZER,
+        sanitizer: isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER,
         call: {
           contractAddress: ContractAddr.from(contract.address),
           selector: hash3.getSelectorFromName("modify_position"),
@@ -24016,25 +24024,27 @@ var VesuAdapter = class _VesuAdapter extends BaseAdapter {
         }
       };
     };
-    this.getMultiplyAdapter = () => {
-      const packedArguments = [
-        toBigInt(this.config.poolId.toString()),
-        // pool id
-        toBigInt(this.config.collateral.address.toString()),
-        // collateral
-        toBigInt(this.config.debt.address.toString()),
-        // debt
-        toBigInt(this.config.vaultAllocator.toString())
-        // vault allocator
-      ];
-      const { isV2 } = getVesuSingletonAddress(this.config.poolId);
-      const output = this.constructSimpleLeafData({
-        id: this.config.id,
-        target: isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1,
-        method: "modify_lever",
-        packedArguments
-      }, SIMPLE_SANITIZER_V2);
-      return { leaf: output, callConstructor: this.getMultiplyCall.bind(this) };
+    this.getMultiplyAdapter = (id) => {
+      return () => {
+        const packedArguments = [
+          toBigInt(this.config.poolId.toString()),
+          // pool id
+          toBigInt(this.config.collateral.address.toString()),
+          // collateral
+          toBigInt(this.config.debt.address.toString()),
+          // debt
+          toBigInt(this.config.vaultAllocator.toString())
+          // vault allocator
+        ];
+        const { isV2 } = getVesuSingletonAddress(this.config.poolId);
+        const output = this.constructSimpleLeafData({
+          id,
+          target: isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1,
+          method: "modify_lever",
+          packedArguments
+        }, SIMPLE_SANITIZER_V2);
+        return { leaf: output, callConstructor: this.getMultiplyCall.bind(this) };
+      };
     };
     this.getMultiplyCall = (params) => {
       const isIncrease = params.isIncrease;
@@ -26726,7 +26736,11 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
         id: "defispring"
       }] };
     }
+    const unusedBalanceAPY = await this.getUnusedBalanceAPY();
+    baseAPYs.push(...[unusedBalanceAPY.apy]);
+    rewardAPYs.push(0);
     const weights = positions.map((p, index) => p.usdValue * (index % 2 == 0 ? 1 : -1));
+    weights.push(unusedBalanceAPY.weight);
     const price = await this.pricer.getPrice(this.metadata.depositTokens[0].symbol);
     const prevAUMUSD = prevAUM.multipliedBy(price.price);
     const baseAPY = this.computeAPY(baseAPYs, weights, prevAUMUSD);
@@ -26741,6 +26755,12 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
       id: "defispring"
     }] };
   }
+  async getUnusedBalanceAPY() {
+    return {
+      apy: 0,
+      weight: 0
+    };
+  }
   computeAPY(apys, weights, currentAUM) {
     assert(apys.length === weights.length, "APYs and weights length mismatch");
     const weightedSum = apys.reduce((acc, apy, i) => acc + apy * weights[i], 0);
@@ -27235,7 +27255,7 @@ function getLooperSettings(token1Symbol, token2Symbol, vaultSettings, pool1, poo
   vaultSettings.leafAdapters.push(vesuAdapterUSDCETH.getDefispringRewardsAdapter("defispring_rewards" /* DEFISPRING_REWARDS */).bind(vesuAdapterUSDCETH));
   const STRKToken = Global.getDefaultTokens().find((token) => token.symbol === "STRK");
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(STRKToken.address, AVNU_MIDDLEWARE, "approve_swap_token1" /* APPROVE_SWAP_TOKEN1 */).bind(commonAdapter));
-  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, USDCToken.address, "avnu_swap_rewards" /* AVNU_SWAP_REWARDS */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, USDCToken.address, "avnu_swap_rewards" /* AVNU_SWAP_REWARDS */, true).bind(commonAdapter));
   return vaultSettings;
 }
 var _riskFactor3 = [
@@ -27589,6 +27609,160 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     logger.verbose(`${this.getTag()}:: LST Dex Price: ${price}`);
     return price;
   }
+  async getAvnuSwapMultiplyCall(params) {
+    return this._getAvnuDepositSwapLegCall({
+      ...params,
+      minHF: 1.02
+    });
+  }
+  async _getAvnuDepositSwapLegCall(params) {
+    logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall params: ${JSON.stringify(params)}`);
+    assert(params.isDeposit, "Only deposit is supported in _getAvnuDepositSwapLegCall");
+    const [vesuAdapter1] = this.getVesuAdapters();
+    const legLTV = await vesuAdapter1.getLTVConfig(this.config);
+    logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall legLTV: ${legLTV}`);
+    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()}::_getAvnuDepositSwapLegCall existingCollateralInfo: ${JSON.stringify(existingCollateralInfo)}, 
+    existingDebtInfo: ${JSON.stringify(existingDebtInfo)}, collateralisation: ${JSON.stringify(collateralisation)}`);
+    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()}::_getAvnuDepositSwapLegCall collateralPrice: ${collateralPrice}, debtPrice: ${debtPrice}`);
+    const totalCollateral = existingCollateralInfo.amount.plus(params.leg1DepositAmount);
+    logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall totalCollateral: ${totalCollateral}`);
+    const totalDebtAmount = totalCollateral.multipliedBy(collateralPrice).multipliedBy(legLTV).dividedBy(debtPrice).dividedBy(params.minHF);
+    logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall totalDebtAmount: ${totalDebtAmount}`);
+    const debtAmount = totalDebtAmount.minus(existingDebtInfo.amount);
+    if (debtAmount.lt(0)) {
+      const lstDEXPrice = await this.getLSTDexPrice();
+      const debtAmountInLST = debtAmount.abs().dividedBy(lstDEXPrice);
+      const calls = await this.getVesuMultiplyCall({
+        isDeposit: false,
+        leg1DepositAmount: debtAmountInLST
+      });
+      assert(calls.length == 1, "Expected 1 call for unwind");
+      return calls[0];
+    }
+    logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall debtAmount: ${debtAmount}`);
+    const STEP0 = "approve_token1" /* APPROVE_TOKEN1 */;
+    const manage0Info = this.getProofs(STEP0);
+    const manageCall0 = manage0Info.callConstructor({
+      amount: params.leg1DepositAmount
+    });
+    const STEP1 = "vesu_leg1" /* VESU_LEG1 */;
+    const manage1Info = this.getProofs(STEP1);
+    const manageCall1 = manage1Info.callConstructor(VesuAdapter.getDefaultModifyPositionCallParams({
+      collateralAmount: params.leg1DepositAmount,
+      isAddCollateral: params.isDeposit,
+      debtAmount,
+      isBorrow: params.isDeposit
+    }));
+    const proofIds = [STEP0, STEP1];
+    const manageCalls = [manageCall0, manageCall1];
+    if (debtAmount.gt(0)) {
+      const STEP2 = "avnu_multiply_approve_deposit" /* AVNU_MULTIPLY_APPROVE_DEPOSIT */;
+      const manage2Info = this.getProofs(STEP2);
+      const manageCall2 = manage2Info.callConstructor({
+        amount: debtAmount
+      });
+      const debtTokenInfo = vesuAdapter1.config.debt;
+      const lstTokenInfo = this.asset();
+      const avnuModule = new AvnuWrapper();
+      const quote = await avnuModule.getQuotes(
+        debtTokenInfo.address.address,
+        lstTokenInfo.address.address,
+        debtAmount.toWei(),
+        this.metadata.additionalInfo.vaultAllocator.address
+      );
+      const minAmount = await this._getMinOutputAmountLSTBuy(debtAmount);
+      const minAmountWei = minAmount.toWei();
+      logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall minAmount: ${minAmount}`);
+      const swapInfo = await avnuModule.getSwapInfo(
+        quote,
+        this.metadata.additionalInfo.vaultAllocator.address,
+        0,
+        this.address.address,
+        minAmountWei
+      );
+      logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall swapInfo: ${JSON.stringify(swapInfo)}`);
+      const STEP3 = "avnu_multiply_swap_deposit" /* AVNU_MULTIPLY_SWAP_DEPOSIT */;
+      const manage3Info = this.getProofs(STEP3);
+      const manageCall3 = manage3Info.callConstructor({
+        props: swapInfo
+      });
+      proofIds.push(STEP2);
+      proofIds.push(STEP3);
+      manageCalls.push(manageCall2, manageCall3);
+      const newCollateral = minAmount.plus(totalCollateral);
+      const newHF = newCollateral.multipliedBy(collateralPrice).multipliedBy(legLTV).dividedBy(totalDebtAmount).dividedBy(debtPrice).toNumber();
+      logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF: ${newHF}`);
+      if (newHF > this.metadata.additionalInfo.minHealthFactor && newHF < this.metadata.additionalInfo.targetHealthFactor + 0.05) {
+        logger.verbose(`${this.getTag()}::_getAvnuDepositSwapLegCall newHF is above min and below target + 0.05, adding collateral on vesu`);
+        const STEP4 = "approve_token1" /* APPROVE_TOKEN1 */;
+        const manage4Info = this.getProofs(STEP4);
+        const manageCall4 = manage4Info.callConstructor({
+          amount: minAmount
+        });
+        const STEP5 = "vesu_leg1" /* VESU_LEG1 */;
+        const manage5Info = this.getProofs(STEP5);
+        const manageCall5 = manage5Info.callConstructor(VesuAdapter.getDefaultModifyPositionCallParams({
+          collateralAmount: minAmount,
+          isAddCollateral: true,
+          debtAmount: Web3Number.fromWei("0", this.asset().decimals),
+          isBorrow: params.isDeposit
+        }));
+        proofIds.push(STEP4, STEP5);
+        manageCalls.push(manageCall4, manageCall5);
+      }
+    }
+    const manageCall = this.getManageCall(proofIds, manageCalls);
+    return manageCall;
+  }
+  // todo unwind or not deposit when the yield is bad. 
+  async getLSTMultiplierRebalanceCall() {
+    const positions = await this.getVaultPositions();
+    assert(positions.length == 3, "Rebalance call is only supported for 3 positions");
+    const existingCollateralInfo = positions[0];
+    const existingDebtInfo = positions[1];
+    const unusedBalance = positions[2];
+    const [healthFactor] = await this.getVesuHealthFactors();
+    const [vesuAdapter1] = this.getVesuAdapters();
+    const legLTV = await vesuAdapter1.getLTVConfig(this.config);
+    const collateralisation = await vesuAdapter1.getCollateralization(this.config);
+    logger.debug(`${this.getTag()}::getVesuMultiplyCall existingCollateralInfo: ${JSON.stringify(existingCollateralInfo)}, 
+    existingDebtInfo: ${JSON.stringify(existingDebtInfo)}, collateralisation: ${JSON.stringify(collateralisation)}`);
+    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}`);
+    const isHFTooLow = healthFactor < this.metadata.additionalInfo.minHealthFactor;
+    const isHFTooHigh = healthFactor > this.metadata.additionalInfo.targetHealthFactor + 0.05;
+    if (isHFTooLow || isHFTooHigh) {
+      const manageCall = await this._getAvnuDepositSwapLegCall({
+        isDeposit: true,
+        leg1DepositAmount: unusedBalance.amount,
+        minHF: 1.02
+        // todo, shouldnt use this 1.02 HF, if there isn;t more looping left. 
+      });
+      return { shouldRebalance: true, manageCall };
+    } else {
+      return { shouldRebalance: false, manageCall: void 0 };
+    }
+  }
+  //
+  async _getMinOutputAmountLSTBuy(amountInUnderlying) {
+    const lstTruePrice = await this.getLSTExchangeRate();
+    const minOutputAmount = amountInUnderlying.dividedBy(lstTruePrice);
+    return minOutputAmount;
+  }
+  async _getMinOutputAmountLSTSell(amountInLST) {
+    const lstTruePrice = await this.getLSTExchangeRate();
+    const minOutputAmount = amountInLST.multipliedBy(lstTruePrice).multipliedBy(0.995);
+    return minOutputAmount;
+  }
+  // todo add a function to findout max borrowable amount without fucking yield
+  // if the current net yield < LST yield, add a function to calculate how much to unwind. 
   /**
    * Uses vesu's multiple call to create leverage on LST
    * Deposit amount is in LST
@@ -27640,12 +27814,40 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
   async getLSTAPR(_address) {
     try {
       const vesuAdapter1 = this.getVesuAdapters()[0];
-      return await LSTAPRService2.getLSTAPR(vesuAdapter1.config.debt.address);
+      const apr = await LSTAPRService.getLSTAPR(vesuAdapter1.config.debt.address);
+      if (!apr) {
+        throw new Error("Failed to get LST APR");
+      }
+      return apr;
     } catch (error) {
       logger.warn(`${this.getTag()}: Failed to get LST APR: ${error}`);
       return 0;
     }
   }
+  // todo undo this
+  async netAPY() {
+    const { net, splits } = await super.netAPY();
+    let _net = net;
+    if (this.asset().symbol == "xWBTC") {
+      const debtToken = this.getVesuAdapters()[0].config.debt;
+      const lstAPY = await this.getLSTAPR(debtToken.address);
+      _net = lstAPY * 5;
+    }
+    return {
+      net: _net,
+      splits
+    };
+  }
+  async getUnusedBalanceAPY() {
+    const unusedBalance = await this.getUnusedBalance();
+    const vesuAdapter = this.getVesuAdapters()[0];
+    const underlying = vesuAdapter.config.debt;
+    const lstAPY = await this.getLSTAPR(underlying.address);
+    return {
+      apy: lstAPY,
+      weight: unusedBalance.usdValue
+    };
+  }
   async getLSTExchangeRate() {
     const [vesuAdapter1] = this.getVesuAdapters();
     const lstTokenInfo = vesuAdapter1.config.collateral;
@@ -27676,7 +27878,7 @@ var UniversalLstMultiplierStrategy = class _UniversalLstMultiplierStrategy exten
     const proofsIDs = [];
     const manageCalls = [];
     if (params.marginAmount.greaterThan(0)) {
-      const STEP1_ID = "approve_token1" /* APPROVE_TOKEN1 */;
+      const STEP1_ID = "multiple_approve" /* MULTIPLE_APPROVE */;
       const manage1Info = this.getProofs(STEP1_ID);
       const depositAmount = params.marginAmount;
       const manageCall1 = manage1Info.callConstructor({
@@ -27806,7 +28008,7 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
     collateral: lstToken,
     debt: underlyingToken,
     vaultAllocator: vaultSettings.vaultAllocator,
-    id: "multiply_vesu" /* MULTIPLY_VESU */
+    id: "vesu_leg1" /* VESU_LEG1 */
   });
   const commonAdapter = new CommonAdapter({
     manager: vaultSettings.manager,
@@ -27815,10 +28017,10 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
     vaultAddress: vaultSettings.vaultAddress,
     vaultAllocator: vaultSettings.vaultAllocator
   });
-  const { isV2 } = getVesuSingletonAddress(pool1);
+  const { isV2, addr: poolAddr } = getVesuSingletonAddress(pool1);
   const VESU_MULTIPLY = isV2 ? vesuAdapterLST.VESU_MULTIPLY : vesuAdapterLST.VESU_MULTIPLY_V1;
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, VESU_MULTIPLY, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
-  vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter.bind(vesuAdapterLST));
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, VESU_MULTIPLY, "multiple_approve" /* MULTIPLE_APPROVE */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getMultiplyAdapter("multiply_vesu" /* MULTIPLY_VESU */).bind(vesuAdapterLST));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter("switch_delegation_on" /* SWITCH_DELEGATION_ON */).bind(vesuAdapterLST));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getVesuModifyDelegationAdapter("switch_delegation_off" /* SWITCH_DELEGATION_OFF */).bind(vesuAdapterLST));
   vaultSettings.adapters.push(...[{
@@ -27828,12 +28030,18 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
     id: "common_adapter" /* COMMON */,
     adapter: commonAdapter
   }]);
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(underlyingToken.address, AVNU_EXCHANGE, "avnu_multiply_approve_deposit" /* AVNU_MULTIPLY_APPROVE_DEPOSIT */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(underlyingToken.address, lstToken.address, "avnu_multiply_swap_deposit" /* AVNU_MULTIPLY_SWAP_DEPOSIT */, false).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, AVNU_EXCHANGE, "avnu_multiply_approve_withdraw" /* AVNU_MULTIPLY_APPROVE_WITHDRAW */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(lstToken.address, underlyingToken.address, "avnu_multiply_swap_withdraw" /* AVNU_MULTIPLY_SWAP_WITHDRAW */, false).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, poolAddr, "approve_token1" /* APPROVE_TOKEN1 */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(vesuAdapterLST.getModifyPosition.bind(vesuAdapterLST));
   vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(lstToken.address, vaultSettings.vaultAddress, "approve_bring_liquidity" /* APPROVE_BRING_LIQUIDITY */).bind(commonAdapter));
   vaultSettings.leafAdapters.push(commonAdapter.getBringLiquidityAdapter("bring_liquidity" /* BRING_LIQUIDITY */).bind(commonAdapter));
   vaultSettings.leafAdapters.push(vesuAdapterLST.getDefispringRewardsAdapter("defispring_rewards" /* DEFISPRING_REWARDS */).bind(vesuAdapterLST));
   const STRKToken = Global.getDefaultTokens().find((token) => token.symbol === "STRK");
-  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(STRKToken.address, AVNU_MIDDLEWARE, "approve_swap_token1" /* APPROVE_SWAP_TOKEN1 */).bind(commonAdapter));
-  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, lstToken.address, "avnu_swap_rewards" /* AVNU_SWAP_REWARDS */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getApproveAdapter(STRKToken.address, AVNU_EXCHANGE, "approve_swap_token1" /* APPROVE_SWAP_TOKEN1 */).bind(commonAdapter));
+  vaultSettings.leafAdapters.push(commonAdapter.getAvnuAdapter(STRKToken.address, lstToken.address, "avnu_swap_rewards" /* AVNU_SWAP_REWARDS */, false).bind(commonAdapter));
   return vaultSettings;
 }
 var AUDIT_URL4 = "https://docs.troves.fi/p/security#starknet-vault-kit";
@@ -27934,11 +28142,11 @@ var hyperxsBTC = {
   minHealthFactor: 1.05
 };
 var hyperxLBTC = {
-  vaultAddress: ContractAddr.from("0x38e96a301428d204ab4553799aa386a0f14a5ef9b30a5830be1814e4fb8da1c"),
-  manager: ContractAddr.from("0x18d376446d9df1f783e17aff1f21bac3d97aa3ba378e367742cdd744468ad35"),
-  vaultAllocator: ContractAddr.from("0x3e98774ca0508505ba6d7f17d95ec391648f44f947b0d211241464a4f5b9b20"),
-  redeemRequestNFT: ContractAddr.from("0x268017b4c8b2117ca0136d9a77e3666db44b143447566f0746ca0b1c9ab1e72"),
-  aumOracle: ContractAddr.from("0x521a3f339c65e918e0d8a065b14baef1ea25676bb7fca1e0238ac47e20d7755"),
+  vaultAddress: ContractAddr.from("0x64cf24d4883fe569926419a0569ab34497c6956a1a308fa883257f7486d7030"),
+  manager: ContractAddr.from("0x203530a4022a99b8f4b406aaf33b0849d43ad7422c1d5cc14ff8c667abec6c0"),
+  vaultAllocator: ContractAddr.from("0x7dbc8ccd4eabce6ea6c19e0e5c9ccca3a93bd510303b9e071cbe25fc508546e"),
+  redeemRequestNFT: ContractAddr.from("0x5ee66a39af9aef3d0d48982b4a63e8bd2a5bad021916bd87fb0eae3a26800b8"),
+  aumOracle: ContractAddr.from("0x23d69e4391fa72d10e625e7575d8bddbb4aff96f04503f83fdde23123bf41d0"),
   leafAdapters: [],
   adapters: [],
   targetHealthFactor: 1.1,
@@ -28035,7 +28243,7 @@ var PricerLST2 = class extends Pricer {
 };
 
 // src/modules/lst-apr.ts
-var LSTAPRService2 = class {
+var LSTAPRService = class {
   // 5 minutes
   /**
    * Fetches LST stats from Endur API with caching
@@ -28130,10 +28338,10 @@ var LSTAPRService2 = class {
     logger.verbose(`LSTAPRService: Cache cleared`);
   }
 };
-LSTAPRService2.ENDUR_API_URL = "https://app.endur.fi/api/lst/stats";
-LSTAPRService2.cache = null;
-LSTAPRService2.cacheTimestamp = 0;
-LSTAPRService2.CACHE_DURATION = 5 * 60 * 1e3;
+LSTAPRService.ENDUR_API_URL = "https://app.endur.fi/api/lst/stats";
+LSTAPRService.cache = null;
+LSTAPRService.cacheTimestamp = 0;
+LSTAPRService.CACHE_DURATION = 5 * 60 * 1e3;
 
 // src/notifs/telegram.ts
 import TelegramBot from "node-telegram-bot-api";
@@ -28644,6 +28852,7 @@ var Deployer = {
 var deployer_default = Deployer;
 export {
   AUMTypes,
+  AVNU_EXCHANGE,
   AVNU_MIDDLEWARE,
   AutoCompounderSTRK,
   AvnuWrapper,
@@ -28662,7 +28871,7 @@ export {
   HyperLSTStrategies,
   ILending,
   Initializable,
-  LSTAPRService2 as LSTAPRService,
+  LSTAPRService,
   MarginType,
   Network,
   PRICE_ROUTER,
@@ -28689,6 +28898,7 @@ export {
   UniversalStrategies,
   UniversalStrategy,
   VESU_SINGLETON,
+  VESU_V2_MODIFY_POSITION_SANITIZER,
   VesuAdapter,
   VesuAmountDenomination,
   VesuAmountType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "1.1.28",
+  "version": "1.1.31",
   "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
   "typings": "dist/index.d.ts",
   "types": "dist/index.d.ts",

package/src/strategies/universal-adapters/adapter-utils.ts

@@ -4,9 +4,11 @@ import { ContractAddr } from "@/dataTypes";
 export const SIMPLE_SANITIZER = ContractAddr.from('0x5a2e3ceb3da368b983a8717898427ab7b6daf04014b70f321e777f9aad940b4');
 // Without flashloan options
 export const SIMPLE_SANITIZER_V2 = ContractAddr.from('0x7b6f98311af8aa425278570e62abf523e6462eaa01a38c1feab9b2f416492e2');
+export const VESU_V2_MODIFY_POSITION_SANITIZER = ContractAddr.from('0x04Bf71F2BD9D6F8819057c9dD524F0d5fbc38317C00500d7b9a0FdCf01195066');
 export const SIMPLE_SANITIZER_VESU_V1_DELEGATIONS = ContractAddr.from('0x5643d54da70a471cd2b6fa37f52ea7a13cc3f3910689a839f8490a663d2208a');
 export const PRICE_ROUTER = ContractAddr.from('0x05e83Fa38D791d2dba8E6f487758A9687FfEe191A6Cf8a6c5761ab0a110DB837');
 export const AVNU_MIDDLEWARE = ContractAddr.from('0x4a7972ed3f5d1e74a6d6c4a8f467666953d081c8f2270390cc169d50d17cb0d');
+export const AVNU_EXCHANGE = ContractAddr.from('0x04270219d365d6b017231b52e92b3fb5d7c8378b05e9abc97724537a80e93b0f');
 
 export const VESU_SINGLETON = ContractAddr.from('0x000d8d6dfec4d33bfb6895de9f3852143a17c6f92fd2a21da3d6924d34870160');
 export function toBigInt(value: string | number): bigint {

package/src/strategies/universal-adapters/common-adapter.ts

@@ -1,7 +1,7 @@
 import { ContractAddr, Web3Number } from "@/dataTypes";
 import { LeafData } from "@/utils";
 import { Call, hash, num, shortString, uint256 } from "starknet";
-import { AVNU_MIDDLEWARE, SIMPLE_SANITIZER, toBigInt } from "./adapter-utils";
+import { AVNU_EXCHANGE, AVNU_MIDDLEWARE, SIMPLE_SANITIZER, toBigInt } from "./adapter-utils";
 import { AdapterLeafType, BaseAdapter, GenerateCallFn, LeafAdapterFn, ManageCall } from "./baseAdapter";
 import { SwapInfo } from "@/modules";
 
@@ -129,11 +129,11 @@ export class CommonAdapter extends BaseAdapter {
     }
   }
 
-  getAvnuAdapter(fromToken: ContractAddr, toToken: ContractAddr, id: string): () => AdapterLeafType<AvnuSwapCallParams> {
+  getAvnuAdapter(fromToken: ContractAddr, toToken: ContractAddr, id: string, isMiddleware: boolean): () => AdapterLeafType<AvnuSwapCallParams> {
     return () => ({
       leaf: this.constructSimpleLeafData({
         id: id,
-        target: AVNU_MIDDLEWARE,
+        target: isMiddleware ? AVNU_MIDDLEWARE : AVNU_EXCHANGE,
         method: 'multi_route_swap',
         packedArguments: [
           fromToken.toBigInt(),
@@ -141,16 +141,16 @@ export class CommonAdapter extends BaseAdapter {
           this.config.vaultAllocator.toBigInt(),
         ]
       }),
-      callConstructor: this.getAvnuCall(fromToken, toToken).bind(this)
+      callConstructor: this.getAvnuCall(fromToken, toToken, isMiddleware).bind(this)
     });
   }
 
-  getAvnuCall(fromToken: ContractAddr, toToken: ContractAddr): GenerateCallFn<AvnuSwapCallParams> {
+  getAvnuCall(fromToken: ContractAddr, toToken: ContractAddr, isMiddleware: boolean): GenerateCallFn<AvnuSwapCallParams> {
     return (params: AvnuSwapCallParams): ManageCall => {
       return {
         sanitizer: SIMPLE_SANITIZER,
         call: {
-          contractAddress: AVNU_MIDDLEWARE,
+          contractAddress: isMiddleware ? AVNU_MIDDLEWARE : AVNU_EXCHANGE,
           selector: hash.getSelectorFromName('multi_route_swap'),
           calldata: [
             fromToken.toBigInt(), // sell_token_address

package/src/strategies/universal-adapters/vesu-adapter.ts

@@ -1,6 +1,6 @@
 import { LeafData, logger  } from "@/utils"
 import { CairoCustomEnum, Contract, hash, num, RpcProvider, shortString, uint256, Uint256 } from "starknet";
-import { SIMPLE_SANITIZER, SIMPLE_SANITIZER_V2, SIMPLE_SANITIZER_VESU_V1_DELEGATIONS, toBigInt, VESU_SINGLETON } from "./adapter-utils";
+import { SIMPLE_SANITIZER, SIMPLE_SANITIZER_V2, SIMPLE_SANITIZER_VESU_V1_DELEGATIONS, toBigInt, VESU_SINGLETON, VESU_V2_MODIFY_POSITION_SANITIZER } from "./adapter-utils";
 import { ContractAddr, Web3Number } from "@/dataTypes";
 import { AdapterLeafType, BaseAdapter, GenerateCallFn, LeafAdapterFn, ManageCall } from "./baseAdapter";
 import VesuSingletonAbi from '../../data/vesu-singleton.abi.json';
@@ -239,20 +239,26 @@ export class VesuAdapter extends BaseAdapter {
 
   getModifyPosition = (): AdapterLeafType<VesuModifyPositionCallParams> => {
     const positionData: bigint[] = [0n];
-    const packedArguments: bigint[] = [
-      toBigInt(this.config.poolId.toString()), // pool id
+    const { addr, isV2 } = getVesuSingletonAddress(this.config.poolId);
+    const commonPackedData: bigint[] = [
       toBigInt(this.config.collateral.address.toString()), // collateral
       toBigInt(this.config.debt.address.toString()), // debt
       toBigInt(this.config.vaultAllocator.toString()), // vault allocator
+    ];
+    const packedArguments: bigint[] = isV2 ? [
+      ...commonPackedData
+    ] : [
+      toBigInt(this.config.poolId.toString()), // pool id
+      ...commonPackedData,
       toBigInt(positionData.length),
       ...positionData
     ];
     const output = this.constructSimpleLeafData({
       id: this.config.id,
-      target: getVesuSingletonAddress(this.config.poolId).addr,
+      target: addr,
       method: 'modify_position',
       packedArguments
-    });
+    }, isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER);
 
     return { leaf: output, callConstructor: this.getModifyPositionCall.bind(this) };
   }
@@ -328,7 +334,7 @@ export class VesuAdapter extends BaseAdapter {
       }
     });
     return {
-      sanitizer: SIMPLE_SANITIZER,
+      sanitizer: isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER,
       call: {
         contractAddress: ContractAddr.from(contract.address),
         selector: hash.getSelectorFromName('modify_position'),
@@ -339,22 +345,24 @@ export class VesuAdapter extends BaseAdapter {
     }
   }
 
-  getMultiplyAdapter = (): AdapterLeafType<VesuMultiplyCallParams> => {
-    const packedArguments: bigint[] = [
-      toBigInt(this.config.poolId.toString()), // pool id
-      toBigInt(this.config.collateral.address.toString()), // collateral
-      toBigInt(this.config.debt.address.toString()), // debt
-      toBigInt(this.config.vaultAllocator.toString()), // vault allocator
-    ];
-    const { isV2 } = getVesuSingletonAddress(this.config.poolId);
-    const output = this.constructSimpleLeafData({
-      id: this.config.id,
-      target: isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1,
-      method: 'modify_lever',
-      packedArguments
-    }, SIMPLE_SANITIZER_V2);
+  getMultiplyAdapter = (id: string): LeafAdapterFn<VesuMultiplyCallParams> => {
+    return () => {
+      const packedArguments: bigint[] = [
+        toBigInt(this.config.poolId.toString()), // pool id
+        toBigInt(this.config.collateral.address.toString()), // collateral
+        toBigInt(this.config.debt.address.toString()), // debt
+        toBigInt(this.config.vaultAllocator.toString()), // vault allocator
+      ];
+      const { isV2 } = getVesuSingletonAddress(this.config.poolId);
+      const output = this.constructSimpleLeafData({
+        id: id,
+        target: isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1,
+        method: 'modify_lever',
+        packedArguments
+      }, SIMPLE_SANITIZER_V2);
 
-    return { leaf: output, callConstructor: this.getMultiplyCall.bind(this) };
+      return { leaf: output, callConstructor: this.getMultiplyCall.bind(this) };
+    }
   }
 
   getMultiplyCall = (params: VesuMultiplyCallParams): ManageCall => {