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

package/dist/index.browser.global.js

@@ -92555,11 +92555,12 @@ spurious results.`);
         logger2.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 (err2) {
+      logger2.error(`error calculating amount deposit on extended when incurring losses: ${err2}`);
       return null;
     }
   };
@@ -92637,21 +92638,35 @@ spurious results.`);
         vaultAllocator: config3.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(num_exports.getHexString(p.id)));
+        const pool = allVesuPools.pools.find(
+          (p) => this.vesuAdapter.config.poolId.eqString(num_exports.getHexString(p.id))
+        );
         if (!pool) {
-          logger2.warn(`VesuMultiplyAdapter: Pool not found for token ${asset.symbol}`);
+          logger2.warn(
+            `VesuMultiplyAdapter: Pool not found for token ${asset.symbol}`
+          );
           return {
             apy: 0,
             type: "base" /* BASE */
@@ -92661,7 +92676,9 @@ spurious results.`);
           (a) => a.symbol.toLowerCase() === asset.symbol.toLowerCase()
         )?.stats;
         if (!assetStats) {
-          logger2.warn(`VesuMultiplyAdapter: Asset stats not found for token ${asset.symbol}`);
+          logger2.warn(
+            `VesuMultiplyAdapter: Asset stats not found for token ${asset.symbol}`
+          );
           return {
             apy: 0,
             type: "base" /* BASE */
@@ -92672,7 +92689,9 @@ spurious results.`);
           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;
@@ -92688,7 +92707,10 @@ spurious results.`);
         this.setCache(CACHE_KEY, result2, 3e5);
         return result2;
       } catch (error2) {
-        logger2.error(`VesuMultiplyAdapter: Error getting APY for ${supportedPosition.asset.symbol}:`, error2);
+        logger2.error(
+          `VesuMultiplyAdapter: Error getting APY for ${supportedPosition.asset.symbol}:`,
+          error2
+        );
         throw error2;
       }
     }
@@ -92701,12 +92723,16 @@ spurious results.`);
       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) {
-          logger2.warn(`VesuMultiplyAdapter: Position not found for token ${supportedPosition.asset.symbol}`);
+          logger2.warn(
+            `VesuMultiplyAdapter: Position not found for token ${supportedPosition.asset.symbol}`
+          );
           return {
             amount: new Web3Number("0", supportedPosition.asset.decimals),
             remarks: "Position not found"
@@ -92719,12 +92745,18 @@ spurious results.`);
         this.setCache(CACHE_KEY, position, 6e4);
         return position;
       } catch (error2) {
-        logger2.error(`VesuMultiplyAdapter: Error getting position for ${supportedPosition.asset.symbol}:`, error2);
+        logger2.error(
+          `VesuMultiplyAdapter: Error getting position for ${supportedPosition.asset.symbol}:`,
+          error2
+        );
         throw error2;
       }
     }
     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;
     }
@@ -92734,9 +92766,15 @@ spurious results.`);
       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");
         }
@@ -92746,13 +92784,23 @@ spurious results.`);
           debt,
           maxBorrowableAPY
         );
-        logger2.verbose(`VesuMultiplyAdapter: Max borrowable: ${maxBorrowable.toNumber()}`);
-        const debtCap = await this.vesuAdapter.getDebtCap(this.config.networkConfig);
+        logger2.verbose(
+          `VesuMultiplyAdapter: Max borrowable: ${maxBorrowable.toNumber()}`
+        );
+        const debtCap = await this.vesuAdapter.getDebtCap(
+          this.config.networkConfig
+        );
         logger2.verbose(`VesuMultiplyAdapter: Debt cap: ${debtCap.toNumber()}`);
         const actualMaxBorrowable = maxBorrowable.minimum(debtCap);
-        logger2.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);
+        logger2.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");
         }
@@ -92770,14 +92818,25 @@ spurious results.`);
         );
         const maxDepositAmount = amount ? amount.minimum(maxCollateralFromDebt) : maxCollateralFromDebt;
         const usdValue = await this.getUSDValue(collateral, maxDepositAmount);
-        logger2.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 })]);
-        logger2.verbose(`VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`);
+        logger2.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 })
+        ]);
+        logger2.verbose(
+          `VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`
+        );
         const borrowAmountUSD = actualMaxBorrowable.multipliedBy(debtPrice.price);
-        logger2.verbose(`VesuMultiplyAdapter: Borrow amount: ${actualMaxBorrowable.toNumber()}, borrow amount USD: ${borrowAmountUSD.toNumber()}`);
+        logger2.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;
-        logger2.verbose(`VesuMultiplyAdapter: Max deposit amount: ${maxDepositAmount.toNumber()}, netAPY: ${netAPY}`);
+        logger2.verbose(
+          `VesuMultiplyAdapter: Max deposit amount: ${maxDepositAmount.toNumber()}, netAPY: ${netAPY}`
+        );
         return {
           tokenInfo: collateral,
           amount: maxDepositAmount,
@@ -92790,7 +92849,10 @@ spurious results.`);
           protocol: this.protocol
         };
       } catch (error2) {
-        logger2.error(`VesuMultiplyAdapter: Error calculating max deposit:`, error2);
+        logger2.error(
+          `VesuMultiplyAdapter: Error calculating max deposit:`,
+          error2
+        );
         throw error2;
       }
     }
@@ -92800,9 +92862,15 @@ spurious results.`);
       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");
         }
@@ -92812,11 +92880,20 @@ spurious results.`);
         const result2 = maxWithdrawable.greaterThan(0) ? maxWithdrawable : new Web3Number("0", collateral.decimals);
         const usdValue = await this.getUSDValue(collateral, result2);
         const debtUSD = debtPosition.usdValue;
-        logger2.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 })]);
-        logger2.verbose(`VesuMultiplyAdapter: Apys: ${apys[0].apy}, ${apys[1].apy}`);
+        logger2.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 })
+        ]);
+        logger2.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;
-        logger2.verbose(`VesuMultiplyAdapter: Max withdraw amount: ${result2.toNumber()}, netAPY: ${netAPY}`);
+        logger2.verbose(
+          `VesuMultiplyAdapter: Max withdraw amount: ${result2.toNumber()}, netAPY: ${netAPY}`
+        );
         return {
           tokenInfo: collateral,
           amount: result2,
@@ -92829,14 +92906,19 @@ spurious results.`);
           protocol: this.protocol
         };
       } catch (error2) {
-        logger2.error(`VesuMultiplyAdapter: Error calculating max withdraw:`, error2);
+        logger2.error(
+          `VesuMultiplyAdapter: Error calculating max withdraw:`,
+          error2
+        );
         throw error2;
       }
     }
     _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
@@ -92900,7 +92982,9 @@ spurious results.`);
       ];
     }
     _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;
@@ -92957,33 +93041,51 @@ spurious results.`);
       const leafConfigs = this._getDepositLeaf();
       const leaves = leafConfigs.map((config3) => {
         const { target, method, packedArguments, sanitizer, id } = config3;
-        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((config3) => {
         const { target, method, packedArguments, sanitizer, id } = config3;
-        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 = uint256_exports.bnToUint256(params.amount.toWei());
       return [
@@ -93055,7 +93157,9 @@ spurious results.`);
       ];
     }
     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
@@ -93110,7 +93214,11 @@ spurious results.`);
       ];
     }
     async getMultiplyCallCalldata(params, isDeposit) {
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getMultiplyCallCalldata params: ${JSON.stringify(params)}, isDeposit: ${isDeposit}, collateral: ${this.config.collateral.symbol}, debt: ${this.config.debt.symbol}`);
+      logger2.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 Contract({
@@ -93120,42 +93228,83 @@ spurious results.`);
       });
       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";
-      logger2.debug(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall existingCollateralInfo: ${JSON.stringify(existingCollateralInfo)}, 
-    existingDebtInfo: ${JSON.stringify(existingDebtInfo)}, collateralisation: ${JSON.stringify(collateralisation)}`);
+      logger2.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;
-      logger2.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;
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall dexPrice: ${dexPrice}, ltv: ${legLTV}`);
+      logger2.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;
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall dexPrice: ${dexPrice}, ltv: ${legLTV}`
+      );
       const addedCollateral = params.amount.multipliedBy(isDeposit ? 1 : -1);
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall addedCollateral: ${addedCollateral}`);
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall addedCollateral: ${addedCollateral}`
+      );
       const numeratorPart1 = existingCollateralInfo.amount.plus(addedCollateral).multipliedBy(collateralPrice).multipliedBy(legLTV);
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}`);
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart1: ${numeratorPart1}`
+      );
       const numeratorPart2 = existingDebtInfo.amount.multipliedBy(debtPrice).multipliedBy(this.config.targetHealthFactor);
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart2: ${numeratorPart2}`);
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall numeratorPart2: ${numeratorPart2}`
+      );
       const denominatorPart = this.config.targetHealthFactor - legLTV / dexPrice;
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall denominatorPart: ${denominatorPart}`);
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall denominatorPart: ${denominatorPart}`
+      );
       const x_debt_usd = numeratorPart1.minus(numeratorPart2).dividedBy(denominatorPart);
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`);
-      logger2.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);
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall x_debt_usd: ${x_debt_usd}`
+      );
+      logger2.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);
       }
-      logger2.verbose(`${_VesuMultiplyAdapter.name}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`);
+      logger2.verbose(
+        `${_VesuMultiplyAdapter.name}::getVesuMultiplyCall debtAmount: ${debtAmount}, marginAmount: ${marginAmount}`
+      );
       if (!debtAmount.isZero()) {
         try {
           const swapQuote = await ekuboQuoter.getQuote(
@@ -93165,26 +93314,49 @@ spurious results.`);
             // 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 (error2) {
-          throw new Error(`VesuMultiplyAdapter: Failed to get swap quote: ${error2}`);
+          throw new Error(
+            `VesuMultiplyAdapter: Failed to get swap quote: ${error2}`
+          );
         }
       }
-      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;
     }
@@ -93198,7 +93370,10 @@ spurious results.`);
         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
       } : {
@@ -93212,7 +93387,10 @@ spurious results.`);
         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
       };
@@ -93228,12 +93406,16 @@ spurious results.`);
       });
       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,
@@ -93247,8 +93429,14 @@ spurious results.`);
       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,
@@ -93256,12 +93444,23 @@ spurious results.`);
       );
       const MAX_SLIPPAGE = 2e-3;
       if (swapQuote.price_impact < 25e-4) {
-        leverSwap = ekuboQuoter.getVesuMultiplyQuote(swapQuote, collateralToken, debtToken);
+        leverSwap = ekuboQuoter.getVesuMultiplyQuote(
+          swapQuote,
+          collateralToken,
+          debtToken
+        );
       } else {
-        logger2.error(`VesuMultiplyAdapter: Price impact too high (${swapQuote.price_impact}), skipping swap`);
+        logger2.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)
       });
@@ -93271,100 +93470,132 @@ spurious results.`);
       if (isIncrease) {
         const _params2 = params;
         return {
-          action: new CairoCustomEnum({ 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 CairoCustomEnum({
+            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(
+                      num_exports.hexToDecimalString(route.pool_key.extension)
+                    )
+                  },
+                  sqrt_ratio_limit: uint256_exports.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(
+                      num_exports.hexToDecimalString(route.pool_key.extension)
+                    )
+                  },
+                  sqrt_ratio_limit: uint256_exports.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 CairoCustomEnum({
+          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(num_exports.hexToDecimalString(route.pool_key.extension))
+                  extension: ContractAddr.from(
+                    route.pool_key.extension
+                  ).toBigInt()
                 },
-                sqrt_ratio_limit: uint256_exports.bnToUint256(route.sqrt_ratio_limit.toWei()),
-                skip_ahead: BigInt(100)
+                sqrt_ratio_limit: uint256_exports.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(num_exports.hexToDecimalString(route.pool_key.extension))
+                  extension: ContractAddr.from(
+                    route.pool_key.extension
+                  ).toBigInt()
                 },
-                sqrt_ratio_limit: uint256_exports.bnToUint256(route.sqrt_ratio_limit.toWei()),
-                skip_ahead: BigInt(0)
+                sqrt_ratio_limit: uint256_exports.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 CairoCustomEnum({ 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: uint256_exports.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: uint256_exports.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() {
@@ -93373,11 +93604,15 @@ spurious results.`);
     }
     async getNetAPY() {
       const positions = await this.getPositions();
-      logger2.verbose(`${this.name}::getNetAPY: positions: ${JSON.stringify(positions)}`);
+      logger2.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),
@@ -93765,6 +94000,7 @@ spurious results.`);
         logger2.error("error initializing client");
         return null;
       }
+      await new Promise((resolve) => setTimeout(resolve, 5e3));
       const orderhistory = await this.getOrderHistory(marketName);
       if (!orderhistory || orderhistory.length === 0) {
         logger2.error(`error getting order: ${orderId}`);
@@ -98140,7 +98376,7 @@ spurious results.`);
           const withdrawalFromExtended = await extendedAdapter.withdrawFromExtended(params.amount);
           if (withdrawalFromExtended) {
             const extendedHoldings2 = await extendedAdapter.getExtendedDepositAmount();
-            logger2.info(`extendedHoldings after withdrawal ${extendedHoldings2}`);
+            logger2.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) {