@strkfarm/sdk 2.0.0-dev.3 → 2.0.0-dev.5

package/dist/index.browser.mjs

@@ -28526,11 +28526,12 @@ var calculateAmountDepositOnExtendedWhenIncurringLosses = async (client) => {
       logger.error(`error getting extended position: extendedHoldings=${extendedHoldings}, latestPosition=${latestPosition}`);
       return null;
     }
-    const positionValueInUSD = latestPosition.value;
+    const positionValueInUSD = new Web3Number(latestPosition.value, USDC_TOKEN_DECIMALS);
     const equity = extendedHoldings.data.equity;
-    const deposit = Number(positionValueInUSD) / extended_leverage - Number(equity);
-    return new Web3Number(Math.floor(deposit / 0.2) * 0.2, USDC_TOKEN_DECIMALS);
+    const deposit = positionValueInUSD.dividedBy(extended_leverage).minus(equity).toFixed(2);
+    return new Web3Number(deposit, USDC_TOKEN_DECIMALS);
   } catch (err) {
+    logger.error(`error calculating amount deposit on extended when incurring losses: ${err}`);
     return null;
   }
 };
@@ -28608,21 +28609,35 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       vaultAllocator: config.vaultAllocator,
       id: ""
     });
-    this.tokenMarketData = new TokenMarketData(this.config.pricer, this.config.networkConfig);
+    this.tokenMarketData = new TokenMarketData(
+      this.config.pricer,
+      this.config.networkConfig
+    );
   }
   async getAPY(supportedPosition) {
     const CACHE_KEY = `apy_${this.config.poolId.address}_${supportedPosition.asset.symbol}`;
     const cacheData = this.getCache(CACHE_KEY);
-    console.log(`${_VesuMultiplyAdapter.name}::getAPY cacheData: ${JSON.stringify(cacheData)}`, this.vesuAdapter.config.poolId.shortString(), this.vesuAdapter.config.collateral.symbol, this.vesuAdapter.config.debt.symbol);
+    console.log(
+      `${_VesuMultiplyAdapter.name}::getAPY cacheData: ${JSON.stringify(
+        cacheData
+      )}`,
+      this.vesuAdapter.config.poolId.shortString(),
+      this.vesuAdapter.config.collateral.symbol,
+      this.vesuAdapter.config.debt.symbol
+    );
     if (cacheData) {
       return cacheData;
     }
     try {
       const allVesuPools = await VesuAdapter.getVesuPools();
       const asset = supportedPosition.asset;
-      const pool = allVesuPools.pools.find((p) => this.vesuAdapter.config.poolId.eqString(num9.getHexString(p.id)));
+      const pool = allVesuPools.pools.find(
+        (p) => this.vesuAdapter.config.poolId.eqString(num9.getHexString(p.id))
+      );
       if (!pool) {
-        logger.warn(`VesuMultiplyAdapter: Pool not found for token ${asset.symbol}`);
+        logger.warn(
+          `VesuMultiplyAdapter: Pool not found for token ${asset.symbol}`
+        );
         return {
           apy: 0,
           type: "base" /* BASE */
@@ -28632,7 +28647,9 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
         (a) => a.symbol.toLowerCase() === asset.symbol.toLowerCase()
       )?.stats;
       if (!assetStats) {
-        logger.warn(`VesuMultiplyAdapter: Asset stats not found for token ${asset.symbol}`);
+        logger.warn(
+          `VesuMultiplyAdapter: Asset stats not found for token ${asset.symbol}`
+        );
         return {
           apy: 0,
           type: "base" /* BASE */
@@ -28643,7 +28660,9 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
         apy = Number(assetStats.borrowApr?.value || 0) / 1e18;
       } else {
         const isAssetBTC = asset.symbol.toLowerCase().includes("btc");
-        const baseAPY = Number(isAssetBTC ? assetStats.btcFiSupplyApr?.value + assetStats.supplyApy?.value : assetStats.supplyApy?.value || 0) / 1e18;
+        const baseAPY = Number(
+          isAssetBTC ? assetStats.btcFiSupplyApr?.value + assetStats.supplyApy?.value : assetStats.supplyApy?.value || 0
+        ) / 1e18;
         const rewardAPY = Number(assetStats.defiSpringSupplyApr?.value || "0") / 1e18;
         const isSupported = this.tokenMarketData.isAPYSupported(asset);
         apy = baseAPY + rewardAPY;
@@ -28659,7 +28678,10 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       this.setCache(CACHE_KEY, result, 3e5);
       return result;
     } catch (error) {
-      logger.error(`VesuMultiplyAdapter: Error getting APY for ${supportedPosition.asset.symbol}:`, error);
+      logger.error(
+        `VesuMultiplyAdapter: Error getting APY for ${supportedPosition.asset.symbol}:`,
+        error
+      );
       throw error;
     }
   }
@@ -28672,12 +28694,16 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     try {
       this.vesuAdapter.networkConfig = this.config.networkConfig;
       this.vesuAdapter.pricer = this.config.pricer;
-      const positions = await this.vesuAdapter.getPositions(this.config.networkConfig);
+      const positions = await this.vesuAdapter.getPositions(
+        this.config.networkConfig
+      );
       let position = positions.find(
         (p) => p.token.address.eq(supportedPosition.asset.address)
       );
       if (!position) {
-        logger.warn(`VesuMultiplyAdapter: Position not found for token ${supportedPosition.asset.symbol}`);
+        logger.warn(
+          `VesuMultiplyAdapter: Position not found for token ${supportedPosition.asset.symbol}`
+        );
         return {
           amount: new Web3Number("0", supportedPosition.asset.decimals),
           remarks: "Position not found"
@@ -28690,12 +28716,18 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       this.setCache(CACHE_KEY, position, 6e4);
       return position;
     } catch (error) {
-      logger.error(`VesuMultiplyAdapter: Error getting position for ${supportedPosition.asset.symbol}:`, error);
+      logger.error(
+        `VesuMultiplyAdapter: Error getting position for ${supportedPosition.asset.symbol}:`,
+        error
+      );
       throw error;
     }
   }
   async maxBorrowableAPY() {
-    const collateralAPY = await this.getAPY({ asset: this.config.collateral, isDebt: false });
+    const collateralAPY = await this.getAPY({
+      asset: this.config.collateral,
+      isDebt: false
+    });
     const apy = collateralAPY.apy * 0.8;
     return apy;
   }
@@ -28705,9 +28737,15 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     try {
       this.vesuAdapter.networkConfig = this.config.networkConfig;
       this.vesuAdapter.pricer = this.config.pricer;
-      const positions = await this.vesuAdapter.getPositions(this.config.networkConfig);
-      const collateralPosition = positions.find((p) => p.token.address.eq(collateral.address));
-      const debtPosition = positions.find((p) => p.token.address.eq(debt.address));
+      const positions = await this.vesuAdapter.getPositions(
+        this.config.networkConfig
+      );
+      const collateralPosition = positions.find(
+        (p) => p.token.address.eq(collateral.address)
+      );
+      const debtPosition = positions.find(
+        (p) => p.token.address.eq(debt.address)
+      );
       if (!collateralPosition || !debtPosition) {
         throw new Error("Could not find current positions");
       }
@@ -28717,13 +28755,23 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
         debt,
         maxBorrowableAPY
       );
-      logger.verbose(`VesuMultiplyAdapter: Max borrowable: ${maxBorrowable.toNumber()}`);
-      const debtCap = await this.vesuAdapter.getDebtCap(this.config.networkConfig);
+      logger.verbose(
+        `VesuMultiplyAdapter: Max borrowable: ${maxBorrowable.toNumber()}`
+      );
+      const debtCap = await this.vesuAdapter.getDebtCap(
+        this.config.networkConfig
+      );
       logger.verbose(`VesuMultiplyAdapter: Debt cap: ${debtCap.toNumber()}`);
       const actualMaxBorrowable = maxBorrowable.minimum(debtCap);
-      logger.verbose(`VesuMultiplyAdapter: Actual max borrowable: ${actualMaxBorrowable.toNumber()}`);
-      const maxLTV = await this.vesuAdapter.getLTVConfig(this.config.networkConfig);
-      const collateralPrice = await this.config.pricer.getPrice(collateral.symbol);
+      logger.verbose(
+        `VesuMultiplyAdapter: Actual max borrowable: ${actualMaxBorrowable.toNumber()}`
+      );
+      const maxLTV = await this.vesuAdapter.getLTVConfig(
+        this.config.networkConfig
+      );
+      const collateralPrice = await this.config.pricer.getPrice(
+        collateral.symbol
+      );
       if (collateralPrice.price === 0) {
         throw new Error("Collateral price is 0");
       }
@@ -28741,14 +28789,25 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       );
       const maxDepositAmount = amount ? amount.minimum(maxCollateralFromDebt) : maxCollateralFromDebt;
       const usdValue = await this.getUSDValue(collateral, maxDepositAmount);
-      logger.verbose(`VesuMultiplyAdapter: Max deposit::USD value: ${usdValue}, amount: ${maxDepositAmount.toNumber()}`);
-      const apys = await Promise.all([this.getAPY({ asset: collateral, isDebt: false }), this.getAPY({ asset: debt, isDebt: true })]);
-      logger.verbose(`VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`);
+      logger.verbose(
+        `VesuMultiplyAdapter: Max deposit::USD value: ${usdValue}, amount: ${maxDepositAmount.toNumber()}`
+      );
+      const apys = await Promise.all([
+        this.getAPY({ asset: collateral, isDebt: false }),
+        this.getAPY({ asset: debt, isDebt: true })
+      ]);
+      logger.verbose(
+        `VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`
+      );
       const borrowAmountUSD = actualMaxBorrowable.multipliedBy(debtPrice.price);
-      logger.verbose(`VesuMultiplyAdapter: Borrow amount: ${actualMaxBorrowable.toNumber()}, borrow amount USD: ${borrowAmountUSD.toNumber()}`);
+      logger.verbose(
+        `VesuMultiplyAdapter: Borrow amount: ${actualMaxBorrowable.toNumber()}, borrow amount USD: ${borrowAmountUSD.toNumber()}`
+      );
       const netCollateralUSD = usdValue + borrowAmountUSD.toNumber();
       const netAPY = (apys[0].apy * netCollateralUSD + apys[1].apy * borrowAmountUSD.toNumber()) / usdValue;
-      logger.verbose(`VesuMultiplyAdapter: Max deposit amount: ${maxDepositAmount.toNumber()}, netAPY: ${netAPY}`);
+      logger.verbose(
+        `VesuMultiplyAdapter: Max deposit amount: ${maxDepositAmount.toNumber()}, netAPY: ${netAPY}`
+      );
       return {
         tokenInfo: collateral,
         amount: maxDepositAmount,
@@ -28761,7 +28820,10 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
         protocol: this.protocol
       };
     } catch (error) {
-      logger.error(`VesuMultiplyAdapter: Error calculating max deposit:`, error);
+      logger.error(
+        `VesuMultiplyAdapter: Error calculating max deposit:`,
+        error
+      );
       throw error;
     }
   }
@@ -28771,9 +28833,15 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     try {
       this.vesuAdapter.networkConfig = this.config.networkConfig;
       this.vesuAdapter.pricer = this.config.pricer;
-      const positions = await this.vesuAdapter.getPositions(this.config.networkConfig);
-      const collateralPosition = positions.find((p) => p.token.address.eq(collateral.address));
-      const debtPosition = positions.find((p) => p.token.address.eq(this.config.debt.address));
+      const positions = await this.vesuAdapter.getPositions(
+        this.config.networkConfig
+      );
+      const collateralPosition = positions.find(
+        (p) => p.token.address.eq(collateral.address)
+      );
+      const debtPosition = positions.find(
+        (p) => p.token.address.eq(this.config.debt.address)
+      );
       if (!collateralPosition || !debtPosition) {
         throw new Error("Could not find current positions");
       }
@@ -28783,11 +28851,20 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       const result = maxWithdrawable.greaterThan(0) ? maxWithdrawable : new Web3Number("0", collateral.decimals);
       const usdValue = await this.getUSDValue(collateral, result);
       const debtUSD = debtPosition.usdValue;
-      logger.verbose(`VesuMultiplyAdapter: Debt USD: ${debtUSD}, collateral USD: ${usdValue}`);
-      const apys = await Promise.all([this.getAPY({ asset: collateral, isDebt: false }), this.getAPY({ asset: debt, isDebt: true })]);
-      logger.verbose(`VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`);
+      logger.verbose(
+        `VesuMultiplyAdapter: Debt USD: ${debtUSD}, collateral USD: ${usdValue}`
+      );
+      const apys = await Promise.all([
+        this.getAPY({ asset: collateral, isDebt: false }),
+        this.getAPY({ asset: debt, isDebt: true })
+      ]);
+      logger.verbose(
+        `VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`
+      );
       const netAPY = usdValue - debtUSD > 0 ? (apys[0].apy * usdValue + apys[1].apy * debtUSD) / (usdValue - debtUSD) : 0;
-      logger.verbose(`VesuMultiplyAdapter: Max withdraw amount: ${result.toNumber()}, netAPY: ${netAPY}`);
+      logger.verbose(
+        `VesuMultiplyAdapter: Max withdraw amount: ${result.toNumber()}, netAPY: ${netAPY}`
+      );
       return {
         tokenInfo: collateral,
         amount: result,
@@ -28800,14 +28877,19 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
         protocol: this.protocol
       };
     } catch (error) {
-      logger.error(`VesuMultiplyAdapter: Error calculating max withdraw:`, error);
+      logger.error(
+        `VesuMultiplyAdapter: Error calculating max withdraw:`,
+        error
+      );
       throw error;
     }
   }
   _getDepositLeaf() {
     const collateral = this.config.collateral;
     const debt = this.config.debt;
-    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(this.config.poolId);
+    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(
+      this.config.poolId
+    );
     const vesuMultiply = isV2 ? this.vesuAdapter.VESU_MULTIPLY : this.vesuAdapter.VESU_MULTIPLY_V1;
     return [
       // Approval step for collateral
@@ -28871,7 +28953,9 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     ];
   }
   _getWithdrawLeaf() {
-    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(this.config.poolId);
+    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(
+      this.config.poolId
+    );
     const vesuMultiply = isV2 ? this.vesuAdapter.VESU_MULTIPLY : this.vesuAdapter.VESU_MULTIPLY_V1;
     const collateral = this.config.collateral;
     const debt = this.config.debt;
@@ -28928,33 +29012,51 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     const leafConfigs = this._getDepositLeaf();
     const leaves = leafConfigs.map((config) => {
       const { target, method, packedArguments, sanitizer, id } = config;
-      const leaf = this.constructSimpleLeafData({
-        id,
-        target,
-        method,
-        packedArguments
-      }, sanitizer);
+      const leaf = this.constructSimpleLeafData(
+        {
+          id,
+          target,
+          method,
+          packedArguments
+        },
+        sanitizer
+      );
       return leaf;
     });
-    return { leaves, callConstructor: this.getDepositCall.bind(this) };
+    return {
+      leaves,
+      callConstructor: this.getDepositCall.bind(
+        this
+      )
+    };
   }
   getWithdrawAdapter() {
     const leafConfigs = this._getWithdrawLeaf();
     const leaves = leafConfigs.map((config) => {
       const { target, method, packedArguments, sanitizer, id } = config;
-      const leaf = this.constructSimpleLeafData({
-        id,
-        target,
-        method,
-        packedArguments
-      }, sanitizer);
+      const leaf = this.constructSimpleLeafData(
+        {
+          id,
+          target,
+          method,
+          packedArguments
+        },
+        sanitizer
+      );
       return leaf;
     });
-    return { leaves, callConstructor: this.getWithdrawCall.bind(this) };
+    return {
+      leaves,
+      callConstructor: this.getWithdrawCall.bind(
+        this
+      )
+    };
   }
   async getDepositCall(params) {
     const collateral = this.config.collateral;
-    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(this.config.poolId);
+    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(
+      this.config.poolId
+    );
     const vesuMultiply = isV2 ? this.vesuAdapter.VESU_MULTIPLY : this.vesuAdapter.VESU_MULTIPLY_V1;
     const uint256MarginAmount = uint25612.bnToUint256(params.amount.toWei());
     return [
@@ -29026,7 +29128,9 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     ];
   }
   async getWithdrawCall(params) {
-    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(this.config.poolId);
+    const { addr: vesuSingleton, isV2 } = getVesuSingletonAddress(
+      this.config.poolId
+    );
     const vesuMultiply = isV2 ? this.vesuAdapter.VESU_MULTIPLY : this.vesuAdapter.VESU_MULTIPLY_V1;
     return [
       // Switch delegation on
@@ -29081,7 +29185,11 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     ];
   }
   async getMultiplyCallCalldata(params, isDeposit) {
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getMultiplyCallCalldata params: ${JSON.stringify(params)}, isDeposit: ${isDeposit}, collateral: ${this.config.collateral.symbol}, debt: ${this.config.debt.symbol}`);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getMultiplyCallCalldata params: ${JSON.stringify(
+        params
+      )}, isDeposit: ${isDeposit}, collateral: ${this.config.collateral.symbol}, debt: ${this.config.debt.symbol}`
+    );
     const { isV2 } = getVesuSingletonAddress(this.config.poolId);
     const vesuMultiply = isV2 ? this.vesuAdapter.VESU_MULTIPLY : this.vesuAdapter.VESU_MULTIPLY_V1;
     const multiplyContract = new Contract12({
@@ -29091,42 +29199,83 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     });
     let leverSwap = [];
     let leverSwapLimitAmount = Web3Number.fromWei(0, this.config.debt.decimals);
-    const existingPositions = await this.vesuAdapter.getPositions(this.config.networkConfig);
-    const collateralisation = await this.vesuAdapter.getCollateralization(this.config.networkConfig);
+    const existingPositions = await this.vesuAdapter.getPositions(
+      this.config.networkConfig
+    );
+    const collateralisation = await this.vesuAdapter.getCollateralization(
+      this.config.networkConfig
+    );
     const existingCollateralInfo = existingPositions[0];
     const existingDebtInfo = existingPositions[1];
     const isDexPriceRequired = existingDebtInfo.token.symbol !== "USDC";
-    logger.debug(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall existingCollateralInfo: ${JSON.stringify(existingCollateralInfo)}, 
-    existingDebtInfo: ${JSON.stringify(existingDebtInfo)}, collateralisation: ${JSON.stringify(collateralisation)}`);
+    logger.debug(`${_VesuMultiplyAdapter.name}::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() : (await this.config.pricer.getPrice(this.config.collateral.symbol)).price;
     const debtPrice = collateralisation[1].usdValue > 0 ? collateralisation[1].usdValue / existingDebtInfo.amount.toNumber() : (await this.config.pricer.getPrice(this.config.debt.symbol)).price;
-    logger.debug(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall collateralPrice: ${collateralPrice}, debtPrice: ${debtPrice}`);
-    const legLTV = await this.vesuAdapter.getLTVConfig(this.config.networkConfig);
-    const ekuboQuoter = new EkuboQuoter(this.config.networkConfig, this.config.pricer);
-    const dexPrice = isDexPriceRequired ? await ekuboQuoter.getDexPrice(this.config.collateral, this.config.debt, this.config.quoteAmountToFetchPrice) : 1;
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall dexPrice: ${dexPrice}, ltv: ${legLTV}`);
+    logger.debug(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall collateralPrice: ${collateralPrice}, debtPrice: ${debtPrice}`
+    );
+    const legLTV = await this.vesuAdapter.getLTVConfig(
+      this.config.networkConfig
+    );
+    const ekuboQuoter = new EkuboQuoter(
+      this.config.networkConfig,
+      this.config.pricer
+    );
+    const dexPrice = isDexPriceRequired ? await ekuboQuoter.getDexPrice(
+      this.config.collateral,
+      this.config.debt,
+      this.config.quoteAmountToFetchPrice
+    ) : 1;
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall dexPrice: ${dexPrice}, ltv: ${legLTV}`
+    );
     const addedCollateral = params.amount.multipliedBy(isDeposit ? 1 : -1);
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall addedCollateral: ${addedCollateral}`);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall addedCollateral: ${addedCollateral}`
+    );
     const numeratorPart1 = existingCollateralInfo.amount.plus(addedCollateral).multipliedBy(collateralPrice).multipliedBy(legLTV);
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}`);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}`
+    );
     const numeratorPart2 = existingDebtInfo.amount.multipliedBy(debtPrice).multipliedBy(this.config.targetHealthFactor);
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart2: ${numeratorPart2}`);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart2: ${numeratorPart2}`
+    );
     const denominatorPart = this.config.targetHealthFactor - legLTV / dexPrice;
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall denominatorPart: ${denominatorPart}`);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall denominatorPart: ${denominatorPart}`
+    );
     const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
-    logger.debug(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`);
-    let debtAmount = new Web3Number(x_debt_usd.dividedBy(debtPrice).toFixed(this.config.debt.decimals), this.config.debt.decimals);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`
+    );
+    logger.debug(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}, numeratorPart2: ${numeratorPart2}, denominatorPart: ${denominatorPart}`
+    );
+    let debtAmount = new Web3Number(
+      x_debt_usd.dividedBy(debtPrice).toFixed(this.config.debt.decimals),
+      this.config.debt.decimals
+    );
     const marginAmount = addedCollateral;
     const collateralToken = this.config.collateral;
     const debtToken = this.config.debt;
-    const debtAmountInCollateralUnits = new Web3Number(debtAmount.multipliedBy(debtPrice).dividedBy(collateralPrice).multipliedBy(10 ** collateralToken.decimals).toFixed(0), collateralToken.decimals);
+    const debtAmountInCollateralUnits = new Web3Number(
+      debtAmount.multipliedBy(debtPrice).dividedBy(collateralPrice).multipliedBy(10 ** collateralToken.decimals).toFixed(0),
+      collateralToken.decimals
+    );
     const isIncrease = debtAmount.greaterThanOrEqualTo(0);
     if (isIncrease && debtAmount.lessThan(0)) {
     } else if (!isIncrease && debtAmount.greaterThan(0)) {
       debtAmount = Web3Number.fromWei(0, this.config.debt.decimals);
     }
-    logger.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
+    logger.verbose(
+      `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`
+    );
     if (!debtAmount.isZero()) {
       try {
         const swapQuote = await ekuboQuoter.getQuote(
@@ -29136,26 +29285,49 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
           // negative for exact amount out
         );
         if (swapQuote.price_impact < 0.01) {
-          leverSwap = ekuboQuoter.getVesuMultiplyQuote(swapQuote, debtToken, collateralToken);
+          leverSwap = debtAmount.isNegative() ? ekuboQuoter.getVesuMultiplyQuote(
+            swapQuote,
+            collateralToken,
+            debtToken
+          ) : ekuboQuoter.getVesuMultiplyQuote(
+            swapQuote,
+            debtToken,
+            collateralToken
+          );
           const MAX_SLIPPAGE = 2e-3;
           if (debtAmount.greaterThan(0)) {
             leverSwapLimitAmount = debtAmount.multipliedBy(1 + MAX_SLIPPAGE);
           } else if (debtAmount.lessThan(0)) {
             leverSwapLimitAmount = debtAmount.abs().multipliedBy(1 - MAX_SLIPPAGE);
           } else {
-            leverSwapLimitAmount = Web3Number.fromWei(0, this.config.debt.decimals);
+            leverSwapLimitAmount = Web3Number.fromWei(
+              0,
+              this.config.debt.decimals
+            );
           }
           await new Promise((resolve) => setTimeout(resolve, 1e4));
         } else {
-          throw new Error(`VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`);
+          throw new Error(
+            `VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`
+          );
         }
       } catch (error) {
-        throw new Error(`VesuMultiplyAdapter: Failed to get swap quote: ${error}`);
+        throw new Error(
+          `VesuMultiplyAdapter: Failed to get swap quote: ${error}`
+        );
       }
     }
-    const multiplyParams = await this.getLeverParams(isIncrease, params, leverSwap, leverSwapLimitAmount);
+    const multiplyParams = await this.getLeverParams(
+      isIncrease,
+      params,
+      leverSwap,
+      leverSwapLimitAmount
+    );
     const call = multiplyContract.populate("modify_lever", {
-      modify_lever_params: this.formatMultiplyParams(isIncrease, multiplyParams)
+      modify_lever_params: this.formatMultiplyParams(
+        isIncrease,
+        multiplyParams
+      )
     });
     return call.calldata;
   }
@@ -29169,7 +29341,10 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       add_margin: params.amount,
       // multiplied by collateral decimals in format
       margin_swap: [],
-      margin_swap_limit_amount: Web3Number.fromWei(0, this.config.collateral.decimals),
+      margin_swap_limit_amount: Web3Number.fromWei(
+        0,
+        this.config.collateral.decimals
+      ),
       lever_swap: leverSwap,
       lever_swap_limit_amount: leverSwapLimitAmount
     } : {
@@ -29183,7 +29358,10 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       lever_swap_limit_amount: leverSwapLimitAmount,
       lever_swap_weights: [],
       withdraw_swap: [],
-      withdraw_swap_limit_amount: Web3Number.fromWei(0, this.config.collateral.decimals),
+      withdraw_swap_limit_amount: Web3Number.fromWei(
+        0,
+        this.config.collateral.decimals
+      ),
       withdraw_swap_weights: [],
       close_position: false
     };
@@ -29199,12 +29377,16 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     });
     let leverSwap = [];
     let leverSwapLimitAmount = Web3Number.fromWei(0, this.config.debt.decimals);
-    const existingPositions = await this.vesuAdapter.getPositions(this.config.networkConfig);
+    const existingPositions = await this.vesuAdapter.getPositions(
+      this.config.networkConfig
+    );
     const existingCollateralInfo = existingPositions[0];
     const existingDebtInfo = existingPositions[1];
     const collateralToken = this.config.collateral;
     const debtToken = this.config.debt;
-    const collateralPrice = await this.config.pricer.getPrice(collateralToken.symbol);
+    const collateralPrice = await this.config.pricer.getPrice(
+      collateralToken.symbol
+    );
     const debtPrice = await this.config.pricer.getPrice(debtToken.symbol);
     const { deltadebtAmountUnits: debtAmountToRepay } = calculateDebtReductionAmountForWithdrawal(
       existingDebtInfo.amount,
@@ -29218,8 +29400,14 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     if (!debtAmountToRepay) {
       throw new Error("error calculating debt amount to repay");
     }
-    const ekuboQuoter = new EkuboQuoter(this.config.networkConfig, this.config.pricer);
-    const debtInDebtUnits = new Web3Number(debtAmountToRepay, debtToken.decimals).dividedBy(debtPrice.price).multipliedBy(10 ** debtToken.decimals);
+    const ekuboQuoter = new EkuboQuoter(
+      this.config.networkConfig,
+      this.config.pricer
+    );
+    const debtInDebtUnits = new Web3Number(
+      debtAmountToRepay,
+      debtToken.decimals
+    ).dividedBy(debtPrice.price).multipliedBy(10 ** debtToken.decimals);
     const swapQuote = await ekuboQuoter.getQuote(
       debtToken.address.address,
       collateralToken.address.address,
@@ -29227,12 +29415,23 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     );
     const MAX_SLIPPAGE = 2e-3;
     if (swapQuote.price_impact < 25e-4) {
-      leverSwap = ekuboQuoter.getVesuMultiplyQuote(swapQuote, collateralToken, debtToken);
+      leverSwap = ekuboQuoter.getVesuMultiplyQuote(
+        swapQuote,
+        collateralToken,
+        debtToken
+      );
     } else {
-      logger.error(`VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`);
+      logger.error(
+        `VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`
+      );
     }
     leverSwapLimitAmount = new Web3Number(debtAmountToRepay, debtToken.decimals).abs().multipliedBy(1 + MAX_SLIPPAGE);
-    const multiplyParams = await this.getLeverParams(false, params, leverSwap, leverSwapLimitAmount);
+    const multiplyParams = await this.getLeverParams(
+      false,
+      params,
+      leverSwap,
+      leverSwapLimitAmount
+    );
     const call = multiplyContract.populate("modify_lever", {
       modify_lever_params: this.formatMultiplyParams(false, multiplyParams)
     });
@@ -29242,100 +29441,132 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
     if (isIncrease) {
       const _params2 = params;
       return {
-        action: new CairoCustomEnum3({ IncreaseLever: {
-          pool_id: _params2.pool_id.toBigInt(),
-          collateral_asset: _params2.collateral_asset.toBigInt(),
-          debt_asset: _params2.debt_asset.toBigInt(),
-          user: _params2.user.toBigInt(),
-          add_margin: BigInt(_params2.add_margin.toWei()),
-          margin_swap: _params2.margin_swap.map((swap) => ({
+        action: new CairoCustomEnum3({
+          IncreaseLever: {
+            pool_id: _params2.pool_id.toBigInt(),
+            collateral_asset: _params2.collateral_asset.toBigInt(),
+            debt_asset: _params2.debt_asset.toBigInt(),
+            user: _params2.user.toBigInt(),
+            add_margin: BigInt(_params2.add_margin.toWei()),
+            margin_swap: _params2.margin_swap.map((swap) => ({
+              route: swap.route.map((route) => ({
+                pool_key: {
+                  token0: route.pool_key.token0.toBigInt(),
+                  token1: route.pool_key.token1.toBigInt(),
+                  fee: route.pool_key.fee,
+                  tick_spacing: route.pool_key.tick_spacing,
+                  extension: BigInt(
+                    num9.hexToDecimalString(route.pool_key.extension)
+                  )
+                },
+                sqrt_ratio_limit: uint25612.bnToUint256(
+                  route.sqrt_ratio_limit.toWei()
+                ),
+                skip_ahead: BigInt(100)
+              })),
+              token_amount: {
+                token: swap.token_amount.token.toBigInt(),
+                amount: swap.token_amount.amount.toI129()
+              }
+            })),
+            margin_swap_limit_amount: BigInt(
+              _params2.margin_swap_limit_amount.toWei()
+            ),
+            lever_swap: _params2.lever_swap.map((swap) => ({
+              route: swap.route.map((route) => ({
+                pool_key: {
+                  token0: route.pool_key.token0.toBigInt(),
+                  token1: route.pool_key.token1.toBigInt(),
+                  fee: route.pool_key.fee,
+                  tick_spacing: route.pool_key.tick_spacing,
+                  extension: BigInt(
+                    num9.hexToDecimalString(route.pool_key.extension)
+                  )
+                },
+                sqrt_ratio_limit: uint25612.bnToUint256(
+                  route.sqrt_ratio_limit.toWei()
+                ),
+                skip_ahead: BigInt(0)
+              })),
+              token_amount: {
+                token: swap.token_amount.token.toBigInt(),
+                amount: swap.token_amount.amount.toI129()
+              }
+            })),
+            lever_swap_limit_amount: BigInt(
+              _params2.lever_swap_limit_amount.toWei()
+            )
+          }
+        })
+      };
+    }
+    const _params = params;
+    return {
+      action: new CairoCustomEnum3({
+        DecreaseLever: {
+          pool_id: _params.pool_id.toBigInt(),
+          collateral_asset: _params.collateral_asset.toBigInt(),
+          debt_asset: _params.debt_asset.toBigInt(),
+          user: _params.user.toBigInt(),
+          sub_margin: BigInt(_params.sub_margin.toWei()),
+          recipient: _params.recipient.toBigInt(),
+          lever_swap: _params.lever_swap.map((swap) => ({
             route: swap.route.map((route) => ({
               pool_key: {
                 token0: route.pool_key.token0.toBigInt(),
                 token1: route.pool_key.token1.toBigInt(),
                 fee: route.pool_key.fee,
                 tick_spacing: route.pool_key.tick_spacing,
-                extension: BigInt(num9.hexToDecimalString(route.pool_key.extension))
+                extension: ContractAddr.from(
+                  route.pool_key.extension
+                ).toBigInt()
               },
-              sqrt_ratio_limit: uint25612.bnToUint256(route.sqrt_ratio_limit.toWei()),
-              skip_ahead: BigInt(100)
+              sqrt_ratio_limit: uint25612.bnToUint256(
+                route.sqrt_ratio_limit.toWei()
+              ),
+              skip_ahead: BigInt(route.skip_ahead.toWei())
             })),
             token_amount: {
               token: swap.token_amount.token.toBigInt(),
               amount: swap.token_amount.amount.toI129()
             }
           })),
-          margin_swap_limit_amount: BigInt(_params2.margin_swap_limit_amount.toWei()),
-          lever_swap: _params2.lever_swap.map((swap) => ({
+          lever_swap_limit_amount: BigInt(
+            _params.lever_swap_limit_amount.toWei()
+          ),
+          lever_swap_weights: _params.lever_swap_weights.map(
+            (weight) => BigInt(weight.toWei())
+          ),
+          withdraw_swap: _params.withdraw_swap.map((swap) => ({
             route: swap.route.map((route) => ({
               pool_key: {
                 token0: route.pool_key.token0.toBigInt(),
                 token1: route.pool_key.token1.toBigInt(),
                 fee: route.pool_key.fee,
                 tick_spacing: route.pool_key.tick_spacing,
-                extension: BigInt(num9.hexToDecimalString(route.pool_key.extension))
+                extension: ContractAddr.from(
+                  route.pool_key.extension
+                ).toBigInt()
               },
-              sqrt_ratio_limit: uint25612.bnToUint256(route.sqrt_ratio_limit.toWei()),
-              skip_ahead: BigInt(0)
+              sqrt_ratio_limit: uint25612.bnToUint256(
+                route.sqrt_ratio_limit.toWei()
+              ),
+              skip_ahead: BigInt(route.skip_ahead.toWei())
             })),
             token_amount: {
               token: swap.token_amount.token.toBigInt(),
               amount: swap.token_amount.amount.toI129()
             }
           })),
-          lever_swap_limit_amount: BigInt(_params2.lever_swap_limit_amount.toWei())
-        } })
-      };
-    }
-    const _params = params;
-    return {
-      action: new CairoCustomEnum3({ DecreaseLever: {
-        pool_id: _params.pool_id.toBigInt(),
-        collateral_asset: _params.collateral_asset.toBigInt(),
-        debt_asset: _params.debt_asset.toBigInt(),
-        user: _params.user.toBigInt(),
-        sub_margin: BigInt(_params.sub_margin.toWei()),
-        recipient: _params.recipient.toBigInt(),
-        lever_swap: _params.lever_swap.map((swap) => ({
-          route: swap.route.map((route) => ({
-            pool_key: {
-              token0: route.pool_key.token0.toBigInt(),
-              token1: route.pool_key.token1.toBigInt(),
-              fee: route.pool_key.fee,
-              tick_spacing: route.pool_key.tick_spacing,
-              extension: ContractAddr.from(route.pool_key.extension).toBigInt()
-            },
-            sqrt_ratio_limit: uint25612.bnToUint256(route.sqrt_ratio_limit.toWei()),
-            skip_ahead: BigInt(route.skip_ahead.toWei())
-          })),
-          token_amount: {
-            token: swap.token_amount.token.toBigInt(),
-            amount: swap.token_amount.amount.toI129()
-          }
-        })),
-        lever_swap_limit_amount: BigInt(_params.lever_swap_limit_amount.toWei()),
-        lever_swap_weights: _params.lever_swap_weights.map((weight) => BigInt(weight.toWei())),
-        withdraw_swap: _params.withdraw_swap.map((swap) => ({
-          route: swap.route.map((route) => ({
-            pool_key: {
-              token0: route.pool_key.token0.toBigInt(),
-              token1: route.pool_key.token1.toBigInt(),
-              fee: route.pool_key.fee,
-              tick_spacing: route.pool_key.tick_spacing,
-              extension: ContractAddr.from(route.pool_key.extension).toBigInt()
-            },
-            sqrt_ratio_limit: uint25612.bnToUint256(route.sqrt_ratio_limit.toWei()),
-            skip_ahead: BigInt(route.skip_ahead.toWei())
-          })),
-          token_amount: {
-            token: swap.token_amount.token.toBigInt(),
-            amount: swap.token_amount.amount.toI129()
-          }
-        })),
-        withdraw_swap_limit_amount: BigInt(_params.withdraw_swap_limit_amount.toWei()),
-        withdraw_swap_weights: _params.withdraw_swap_weights.map((weight) => BigInt(weight.toWei())),
-        close_position: _params.close_position
-      } })
+          withdraw_swap_limit_amount: BigInt(
+            _params.withdraw_swap_limit_amount.toWei()
+          ),
+          withdraw_swap_weights: _params.withdraw_swap_weights.map(
+            (weight) => BigInt(weight.toWei())
+          ),
+          close_position: _params.close_position
+        }
+      })
     };
   }
   async getHealthFactor() {
@@ -29344,11 +29575,15 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
   }
   async getNetAPY() {
     const positions = await this.getPositions();
-    logger.verbose(`${this.name}::getNetAPY: positions: ${JSON.stringify(positions)}`);
+    logger.verbose(
+      `${this.name}::getNetAPY: positions: ${JSON.stringify(positions)}`
+    );
     const allZero = positions.every((p) => p.usdValue === 0);
     if (allZero) {
       const collateralUSD = 1e3;
-      const maxLTV = await this.vesuAdapter.getLTVConfig(this.config.networkConfig);
+      const maxLTV = await this.vesuAdapter.getLTVConfig(
+        this.config.networkConfig
+      );
       const targetHF = this.config.targetHealthFactor;
       const maxDebt = HealthFactorMath.getMaxDebtAmountOnLooping(
         new Web3Number(collateralUSD, this.config.collateral.decimals),
@@ -29738,6 +29973,7 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
       logger.error("error initializing client");
       return null;
     }
+    await new Promise((resolve) => setTimeout(resolve, 5e3));
     const orderhistory = await this.getOrderHistory(marketName);
     if (!orderhistory || orderhistory.length === 0) {
       logger.error(`error getting order: ${orderId}`);
@@ -34118,7 +34354,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         const withdrawalFromExtended = await extendedAdapter.withdrawFromExtended(params.amount);
         if (withdrawalFromExtended) {
           const extendedHoldings2 = await extendedAdapter.getExtendedDepositAmount();
-          logger.info(`extendedHoldings after withdrawal ${extendedHoldings2}`);
+          logger.info(`extendedHoldings after withdrawal ${extendedHoldings2?.availableForWithdrawal}`);
           await new Promise((resolve) => setTimeout(resolve, 1e4));
           const calls = await this.moveAssetsToVaultAllocator(params.amount, extendedAdapter);
           if (calls.length > 0) {