@strkfarm/sdk 2.0.0-dev.24 → 2.0.0-dev.26

package/dist/index.browser.global.js

@@ -92620,14 +92620,14 @@ spurious results.`);
   var calculateBTCPriceDelta = (btcPrice, lastBtcPrice) => {
     return (btcPrice - lastBtcPrice) / lastBtcPrice * 100;
   };
-  var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice, vesuDebtAmountToBeRepaid) => {
+  var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice) => {
     const extendedLeverage = calculateExtendedLevergae();
     const vesuLeverage = calculateVesuLeverage();
     const extendedAmount = extendedHoldingAmount;
     const extendedAmountInBTC = extendedAmount.dividedBy(collateralPrice);
     const numerator1 = extendedAmount.multipliedBy(extendedLeverage).plus(extendedPositonValue);
     const numerator2 = collateralAmount.multipliedBy(collateralPrice).multipliedBy(-1);
-    const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage).plus(vesuDebtAmountToBeRepaid);
+    const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage);
     const vesuAmountInBTC = vesuAmountInUsd.dividedBy(collateralPrice).toFixed(WBTC_TOKEN_DECIMALS);
     return {
       vesuAmountInUsd: vesuAmountInUsd.toFixed(2),
@@ -92637,10 +92637,13 @@ spurious results.`);
   };
   var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollateral, existingVesuDebt, collateralPrice, debtPrice, targetHf = TARGET_HF) => {
     try {
-      const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv).dividedBy(targetHf);
+      const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv);
+      logger2.info(`term1: ${term1.toNumber()}`);
       const term2 = existingVesuDebt.multipliedBy(debtPrice).multipliedBy(targetHf).multipliedBy(-1);
+      logger2.info(`term2: ${term2.toNumber()}`);
       const debtAmountToBeRepaid = term1.plus(term2).dividedBy(targetHf);
-      return debtAmountToBeRepaid;
+      logger2.info(`debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`);
+      return new Web3Number(debtAmountToBeRepaid.toFixed(USDC_TOKEN_DECIMALS), USDC_TOKEN_DECIMALS);
     } catch (err2) {
       logger2.error(`error calculating delta position: ${err2}`);
       return null;
@@ -92648,21 +92651,16 @@ spurious results.`);
   };
   var calculatePositionToCloseToWithdrawAmount = async (extendedBalance, extendedPositions, amountToWithdraw) => {
     try {
+      const extendedLeverage = calculateExtendedLevergae();
       const extendedPosition = extendedPositions.value;
-      const unrealisedPnl = new Web3Number(
-        extendedBalance.unrealisedPnl,
-        USDC_TOKEN_DECIMALS
-      );
-      const availableForWithdrawal = new Web3Number(
-        extendedBalance.availableForWithdrawal,
-        USDC_TOKEN_DECIMALS
-      );
-      const netAmount = amountToWithdraw.minus(availableForWithdrawal);
+      const marginRequired = new Web3Number(extendedBalance.initialMargin, USDC_TOKEN_DECIMALS);
+      const unrealisedPnl = new Web3Number(extendedBalance.unrealisedPnl, USDC_TOKEN_DECIMALS);
+      const availableForWithdrawal = new Web3Number(extendedBalance.availableForWithdrawal, USDC_TOKEN_DECIMALS);
       const upnlPercent = unrealisedPnl.dividedBy(extendedPosition);
-      console.log(`upnlPercent: ${upnlPercent}`);
-      const denm = upnlPercent.multipliedBy(3).plus(1);
-      const amountToClose = netAmount.multipliedBy(3).dividedBy(denm);
-      return new Web3Number(Math.ceil(amountToClose.toNumber()), USDC_TOKEN_DECIMALS);
+      const walletBalance = new Web3Number(extendedBalance.balance, USDC_TOKEN_DECIMALS);
+      const term1 = marginRequired.minus(walletBalance).minus(availableForWithdrawal).plus(amountToWithdraw).multipliedBy(extendedLeverage);
+      const denominator = upnlPercent.multipliedBy(extendedLeverage).plus(1);
+      return new Web3Number(Math.ceil(term1.dividedBy(denominator).dividedBy(extendedLeverage).toNumber()), USDC_TOKEN_DECIMALS);
     } catch (err2) {
       logger2.error(
         `error calculating position to close to withdraw amount: ${err2}`
@@ -98724,7 +98722,10 @@ spurious results.`);
             debtAmountToBeRepaid: new Web3Number(0, 0)
           };
         }
-        const amountToInvestAfterRepayingDebt = amountToInvest.minus(debtAmountToBeRepaid);
+        logger2.info(
+          `${_VesuExtendedMultiplierStrategy.name}::shouldInvest debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`
+        );
+        const amountToInvestAfterRepayingDebt = amountToInvest.plus(debtAmountToBeRepaid);
         const { vesu_amount, extended_amount, extended_leverage, vesu_leverage } = await calculateAmountDistribution(
           amountToInvestAfterRepayingDebt.toNumber(),
           extendedAdapter.client,
@@ -99260,7 +99261,9 @@ spurious results.`);
           );
           const extendedPositions = await extendedAdapter.getAllOpenPositions();
           if (!extendedPositions) {
-            logger2.error(`error getting extended positions: ${extendedPositions} while moving assets from extended to vault`);
+            logger2.error(
+              `error getting extended positions: ${extendedPositions} while moving assets from extended to vault`
+            );
             return this.createTransactionResult(
               [],
               false,
@@ -99276,8 +99279,14 @@ spurious results.`);
               ),
               USDC_TOKEN_DECIMALS
             );
-            const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(extendedHoldings, extendedPositions[0], params.amount);
-            logger2.info(`positionAmountToClose: ${positionAmountToClose.toNumber()}`);
+            const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(
+              extendedHoldings,
+              extendedPositions[0],
+              params.amount
+            );
+            logger2.info(
+              `positionAmountToClose: ${positionAmountToClose} this is without leverage`
+            );
             logger2.info(
               `${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`
             );
@@ -99383,7 +99392,7 @@ spurious results.`);
             avnuAdapter,
             "close" /* CLOSE */
           );
-          if (!isPriceDifferenceBetweenAvnuAndExtended) {
+          if (!isPriceDifferenceBetweenAvnuAndExtended && params.cycleType === "WITHDRAWAL" /* WITHDRAWAL */) {
             logger2.warn(
               `price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`
             );

package/dist/index.browser.mjs

@@ -28575,14 +28575,14 @@ var calculateExposureDelta = (exposure_extended, exposure_vesu) => {
 var calculateBTCPriceDelta = (btcPrice, lastBtcPrice) => {
   return (btcPrice - lastBtcPrice) / lastBtcPrice * 100;
 };
-var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice, vesuDebtAmountToBeRepaid) => {
+var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice) => {
   const extendedLeverage = calculateExtendedLevergae();
   const vesuLeverage = calculateVesuLeverage();
   const extendedAmount = extendedHoldingAmount;
   const extendedAmountInBTC = extendedAmount.dividedBy(collateralPrice);
   const numerator1 = extendedAmount.multipliedBy(extendedLeverage).plus(extendedPositonValue);
   const numerator2 = collateralAmount.multipliedBy(collateralPrice).multipliedBy(-1);
-  const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage).plus(vesuDebtAmountToBeRepaid);
+  const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage);
   const vesuAmountInBTC = vesuAmountInUsd.dividedBy(collateralPrice).toFixed(WBTC_TOKEN_DECIMALS);
   return {
     vesuAmountInUsd: vesuAmountInUsd.toFixed(2),
@@ -28592,10 +28592,13 @@ var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHold
 };
 var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollateral, existingVesuDebt, collateralPrice, debtPrice, targetHf = TARGET_HF) => {
   try {
-    const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv).dividedBy(targetHf);
+    const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv);
+    logger.info(`term1: ${term1.toNumber()}`);
     const term2 = existingVesuDebt.multipliedBy(debtPrice).multipliedBy(targetHf).multipliedBy(-1);
+    logger.info(`term2: ${term2.toNumber()}`);
     const debtAmountToBeRepaid = term1.plus(term2).dividedBy(targetHf);
-    return debtAmountToBeRepaid;
+    logger.info(`debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`);
+    return new Web3Number(debtAmountToBeRepaid.toFixed(USDC_TOKEN_DECIMALS), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(`error calculating delta position: ${err}`);
     return null;
@@ -28603,21 +28606,16 @@ var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollatera
 };
 var calculatePositionToCloseToWithdrawAmount = async (extendedBalance, extendedPositions, amountToWithdraw) => {
   try {
+    const extendedLeverage = calculateExtendedLevergae();
     const extendedPosition = extendedPositions.value;
-    const unrealisedPnl = new Web3Number(
-      extendedBalance.unrealisedPnl,
-      USDC_TOKEN_DECIMALS
-    );
-    const availableForWithdrawal = new Web3Number(
-      extendedBalance.availableForWithdrawal,
-      USDC_TOKEN_DECIMALS
-    );
-    const netAmount = amountToWithdraw.minus(availableForWithdrawal);
+    const marginRequired = new Web3Number(extendedBalance.initialMargin, USDC_TOKEN_DECIMALS);
+    const unrealisedPnl = new Web3Number(extendedBalance.unrealisedPnl, USDC_TOKEN_DECIMALS);
+    const availableForWithdrawal = new Web3Number(extendedBalance.availableForWithdrawal, USDC_TOKEN_DECIMALS);
     const upnlPercent = unrealisedPnl.dividedBy(extendedPosition);
-    console.log(`upnlPercent: ${upnlPercent}`);
-    const denm = upnlPercent.multipliedBy(3).plus(1);
-    const amountToClose = netAmount.multipliedBy(3).dividedBy(denm);
-    return new Web3Number(Math.ceil(amountToClose.toNumber()), USDC_TOKEN_DECIMALS);
+    const walletBalance = new Web3Number(extendedBalance.balance, USDC_TOKEN_DECIMALS);
+    const term1 = marginRequired.minus(walletBalance).minus(availableForWithdrawal).plus(amountToWithdraw).multipliedBy(extendedLeverage);
+    const denominator = upnlPercent.multipliedBy(extendedLeverage).plus(1);
+    return new Web3Number(Math.ceil(term1.dividedBy(denominator).dividedBy(extendedLeverage).toNumber()), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(
       `error calculating position to close to withdraw amount: ${err}`
@@ -34686,7 +34684,10 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           debtAmountToBeRepaid: new Web3Number(0, 0)
         };
       }
-      const amountToInvestAfterRepayingDebt = amountToInvest.minus(debtAmountToBeRepaid);
+      logger.info(
+        `${_VesuExtendedMultiplierStrategy.name}::shouldInvest debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`
+      );
+      const amountToInvestAfterRepayingDebt = amountToInvest.plus(debtAmountToBeRepaid);
       const { vesu_amount, extended_amount, extended_leverage, vesu_leverage } = await calculateAmountDistribution(
         amountToInvestAfterRepayingDebt.toNumber(),
         extendedAdapter.client,
@@ -35222,7 +35223,9 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         const extendedPositions = await extendedAdapter.getAllOpenPositions();
         if (!extendedPositions) {
-          logger.error(`error getting extended positions: ${extendedPositions} while moving assets from extended to vault`);
+          logger.error(
+            `error getting extended positions: ${extendedPositions} while moving assets from extended to vault`
+          );
           return this.createTransactionResult(
             [],
             false,
@@ -35238,8 +35241,14 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
             ),
             USDC_TOKEN_DECIMALS
           );
-          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(extendedHoldings, extendedPositions[0], params.amount);
-          logger.info(`positionAmountToClose: ${positionAmountToClose.toNumber()}`);
+          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(
+            extendedHoldings,
+            extendedPositions[0],
+            params.amount
+          );
+          logger.info(
+            `positionAmountToClose: ${positionAmountToClose} this is without leverage`
+          );
           logger.info(
             `${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`
           );
@@ -35345,7 +35354,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           avnuAdapter,
           "close" /* CLOSE */
         );
-        if (!isPriceDifferenceBetweenAvnuAndExtended) {
+        if (!isPriceDifferenceBetweenAvnuAndExtended && params.cycleType === "WITHDRAWAL" /* WITHDRAWAL */) {
           logger.warn(
             `price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`
           );

package/dist/index.d.ts

@@ -2784,7 +2784,7 @@ declare const calculateExposureDelta: (exposure_extended: number, exposure_vesu:
  * @returns {number} The delta percentage
  */
 declare const calculateBTCPriceDelta: (btcPrice: number, lastBtcPrice: number) => number;
-declare const calculateVesUPositionSizeGivenExtended: (extendedPositonValue: number, extendedHoldingAmount: Web3Number, collateralAmount: Web3Number, collateralPrice: number, vesuDebtAmountToBeRepaid: Web3Number) => {
+declare const calculateVesUPositionSizeGivenExtended: (extendedPositonValue: number, extendedHoldingAmount: Web3Number, collateralAmount: Web3Number, collateralPrice: number) => {
     vesuAmountInUsd: string;
     vesuAmountInBTC: Web3Number;
     extendedAmountInBTC: Web3Number;

package/dist/index.js

@@ -28379,14 +28379,14 @@ var calculateExposureDelta = (exposure_extended, exposure_vesu) => {
 var calculateBTCPriceDelta = (btcPrice, lastBtcPrice) => {
   return (btcPrice - lastBtcPrice) / lastBtcPrice * 100;
 };
-var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice, vesuDebtAmountToBeRepaid) => {
+var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice) => {
   const extendedLeverage = calculateExtendedLevergae();
   const vesuLeverage = calculateVesuLeverage();
   const extendedAmount = extendedHoldingAmount;
   const extendedAmountInBTC = extendedAmount.dividedBy(collateralPrice);
   const numerator1 = extendedAmount.multipliedBy(extendedLeverage).plus(extendedPositonValue);
   const numerator2 = collateralAmount.multipliedBy(collateralPrice).multipliedBy(-1);
-  const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage).plus(vesuDebtAmountToBeRepaid);
+  const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage);
   const vesuAmountInBTC = vesuAmountInUsd.dividedBy(collateralPrice).toFixed(WBTC_TOKEN_DECIMALS);
   return {
     vesuAmountInUsd: vesuAmountInUsd.toFixed(2),
@@ -28396,10 +28396,13 @@ var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHold
 };
 var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollateral, existingVesuDebt, collateralPrice, debtPrice, targetHf = TARGET_HF) => {
   try {
-    const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv).dividedBy(targetHf);
+    const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv);
+    logger.info(`term1: ${term1.toNumber()}`);
     const term2 = existingVesuDebt.multipliedBy(debtPrice).multipliedBy(targetHf).multipliedBy(-1);
+    logger.info(`term2: ${term2.toNumber()}`);
     const debtAmountToBeRepaid = term1.plus(term2).dividedBy(targetHf);
-    return debtAmountToBeRepaid;
+    logger.info(`debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`);
+    return new Web3Number(debtAmountToBeRepaid.toFixed(USDC_TOKEN_DECIMALS), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(`error calculating delta position: ${err}`);
     return null;
@@ -28407,21 +28410,16 @@ var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollatera
 };
 var calculatePositionToCloseToWithdrawAmount = async (extendedBalance, extendedPositions, amountToWithdraw) => {
   try {
+    const extendedLeverage = calculateExtendedLevergae();
     const extendedPosition = extendedPositions.value;
-    const unrealisedPnl = new Web3Number(
-      extendedBalance.unrealisedPnl,
-      USDC_TOKEN_DECIMALS
-    );
-    const availableForWithdrawal = new Web3Number(
-      extendedBalance.availableForWithdrawal,
-      USDC_TOKEN_DECIMALS
-    );
-    const netAmount = amountToWithdraw.minus(availableForWithdrawal);
+    const marginRequired = new Web3Number(extendedBalance.initialMargin, USDC_TOKEN_DECIMALS);
+    const unrealisedPnl = new Web3Number(extendedBalance.unrealisedPnl, USDC_TOKEN_DECIMALS);
+    const availableForWithdrawal = new Web3Number(extendedBalance.availableForWithdrawal, USDC_TOKEN_DECIMALS);
     const upnlPercent = unrealisedPnl.dividedBy(extendedPosition);
-    console.log(`upnlPercent: ${upnlPercent}`);
-    const denm = upnlPercent.multipliedBy(3).plus(1);
-    const amountToClose = netAmount.multipliedBy(3).dividedBy(denm);
-    return new Web3Number(Math.ceil(amountToClose.toNumber()), USDC_TOKEN_DECIMALS);
+    const walletBalance = new Web3Number(extendedBalance.balance, USDC_TOKEN_DECIMALS);
+    const term1 = marginRequired.minus(walletBalance).minus(availableForWithdrawal).plus(amountToWithdraw).multipliedBy(extendedLeverage);
+    const denominator = upnlPercent.multipliedBy(extendedLeverage).plus(1);
+    return new Web3Number(Math.ceil(term1.dividedBy(denominator).dividedBy(extendedLeverage).toNumber()), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(
       `error calculating position to close to withdraw amount: ${err}`
@@ -34845,7 +34843,10 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           debtAmountToBeRepaid: new Web3Number(0, 0)
         };
       }
-      const amountToInvestAfterRepayingDebt = amountToInvest.minus(debtAmountToBeRepaid);
+      logger.info(
+        `${_VesuExtendedMultiplierStrategy.name}::shouldInvest debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`
+      );
+      const amountToInvestAfterRepayingDebt = amountToInvest.plus(debtAmountToBeRepaid);
       const { vesu_amount, extended_amount, extended_leverage, vesu_leverage } = await calculateAmountDistribution(
         amountToInvestAfterRepayingDebt.toNumber(),
         extendedAdapter.client,
@@ -35381,7 +35382,9 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         const extendedPositions = await extendedAdapter.getAllOpenPositions();
         if (!extendedPositions) {
-          logger.error(`error getting extended positions: ${extendedPositions} while moving assets from extended to vault`);
+          logger.error(
+            `error getting extended positions: ${extendedPositions} while moving assets from extended to vault`
+          );
           return this.createTransactionResult(
             [],
             false,
@@ -35397,8 +35400,14 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
             ),
             USDC_TOKEN_DECIMALS
           );
-          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(extendedHoldings, extendedPositions[0], params.amount);
-          logger.info(`positionAmountToClose: ${positionAmountToClose.toNumber()}`);
+          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(
+            extendedHoldings,
+            extendedPositions[0],
+            params.amount
+          );
+          logger.info(
+            `positionAmountToClose: ${positionAmountToClose} this is without leverage`
+          );
           logger.info(
             `${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`
           );
@@ -35504,7 +35513,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           avnuAdapter,
           "close" /* CLOSE */
         );
-        if (!isPriceDifferenceBetweenAvnuAndExtended) {
+        if (!isPriceDifferenceBetweenAvnuAndExtended && params.cycleType === "WITHDRAWAL" /* WITHDRAWAL */) {
           logger.warn(
             `price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`
           );

package/dist/index.mjs

@@ -28231,14 +28231,14 @@ var calculateExposureDelta = (exposure_extended, exposure_vesu) => {
 var calculateBTCPriceDelta = (btcPrice, lastBtcPrice) => {
   return (btcPrice - lastBtcPrice) / lastBtcPrice * 100;
 };
-var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice, vesuDebtAmountToBeRepaid) => {
+var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHoldingAmount, collateralAmount, collateralPrice) => {
   const extendedLeverage = calculateExtendedLevergae();
   const vesuLeverage = calculateVesuLeverage();
   const extendedAmount = extendedHoldingAmount;
   const extendedAmountInBTC = extendedAmount.dividedBy(collateralPrice);
   const numerator1 = extendedAmount.multipliedBy(extendedLeverage).plus(extendedPositonValue);
   const numerator2 = collateralAmount.multipliedBy(collateralPrice).multipliedBy(-1);
-  const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage).plus(vesuDebtAmountToBeRepaid);
+  const vesuAmountInUsd = numerator1.plus(numerator2).dividedBy(vesuLeverage);
   const vesuAmountInBTC = vesuAmountInUsd.dividedBy(collateralPrice).toFixed(WBTC_TOKEN_DECIMALS);
   return {
     vesuAmountInUsd: vesuAmountInUsd.toFixed(2),
@@ -28248,10 +28248,13 @@ var calculateVesUPositionSizeGivenExtended = (extendedPositonValue, extendedHold
 };
 var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollateral, existingVesuDebt, collateralPrice, debtPrice, targetHf = TARGET_HF) => {
   try {
-    const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv).dividedBy(targetHf);
+    const term1 = existingVesuCollateral.multipliedBy(collateralPrice).multipliedBy(maxLtv);
+    logger.info(`term1: ${term1.toNumber()}`);
     const term2 = existingVesuDebt.multipliedBy(debtPrice).multipliedBy(targetHf).multipliedBy(-1);
+    logger.info(`term2: ${term2.toNumber()}`);
     const debtAmountToBeRepaid = term1.plus(term2).dividedBy(targetHf);
-    return debtAmountToBeRepaid;
+    logger.info(`debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`);
+    return new Web3Number(debtAmountToBeRepaid.toFixed(USDC_TOKEN_DECIMALS), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(`error calculating delta position: ${err}`);
     return null;
@@ -28259,21 +28262,16 @@ var calculateDeltaDebtAmount = (maxLtv = MAX_LTV_BTC_USDC, existingVesuCollatera
 };
 var calculatePositionToCloseToWithdrawAmount = async (extendedBalance, extendedPositions, amountToWithdraw) => {
   try {
+    const extendedLeverage = calculateExtendedLevergae();
     const extendedPosition = extendedPositions.value;
-    const unrealisedPnl = new Web3Number(
-      extendedBalance.unrealisedPnl,
-      USDC_TOKEN_DECIMALS
-    );
-    const availableForWithdrawal = new Web3Number(
-      extendedBalance.availableForWithdrawal,
-      USDC_TOKEN_DECIMALS
-    );
-    const netAmount = amountToWithdraw.minus(availableForWithdrawal);
+    const marginRequired = new Web3Number(extendedBalance.initialMargin, USDC_TOKEN_DECIMALS);
+    const unrealisedPnl = new Web3Number(extendedBalance.unrealisedPnl, USDC_TOKEN_DECIMALS);
+    const availableForWithdrawal = new Web3Number(extendedBalance.availableForWithdrawal, USDC_TOKEN_DECIMALS);
     const upnlPercent = unrealisedPnl.dividedBy(extendedPosition);
-    console.log(`upnlPercent: ${upnlPercent}`);
-    const denm = upnlPercent.multipliedBy(3).plus(1);
-    const amountToClose = netAmount.multipliedBy(3).dividedBy(denm);
-    return new Web3Number(Math.ceil(amountToClose.toNumber()), USDC_TOKEN_DECIMALS);
+    const walletBalance = new Web3Number(extendedBalance.balance, USDC_TOKEN_DECIMALS);
+    const term1 = marginRequired.minus(walletBalance).minus(availableForWithdrawal).plus(amountToWithdraw).multipliedBy(extendedLeverage);
+    const denominator = upnlPercent.multipliedBy(extendedLeverage).plus(1);
+    return new Web3Number(Math.ceil(term1.dividedBy(denominator).dividedBy(extendedLeverage).toNumber()), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(
       `error calculating position to close to withdraw amount: ${err}`
@@ -34697,7 +34695,10 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           debtAmountToBeRepaid: new Web3Number(0, 0)
         };
       }
-      const amountToInvestAfterRepayingDebt = amountToInvest.minus(debtAmountToBeRepaid);
+      logger.info(
+        `${_VesuExtendedMultiplierStrategy.name}::shouldInvest debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`
+      );
+      const amountToInvestAfterRepayingDebt = amountToInvest.plus(debtAmountToBeRepaid);
       const { vesu_amount, extended_amount, extended_leverage, vesu_leverage } = await calculateAmountDistribution(
         amountToInvestAfterRepayingDebt.toNumber(),
         extendedAdapter.client,
@@ -35233,7 +35234,9 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         const extendedPositions = await extendedAdapter.getAllOpenPositions();
         if (!extendedPositions) {
-          logger.error(`error getting extended positions: ${extendedPositions} while moving assets from extended to vault`);
+          logger.error(
+            `error getting extended positions: ${extendedPositions} while moving assets from extended to vault`
+          );
           return this.createTransactionResult(
             [],
             false,
@@ -35249,8 +35252,14 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
             ),
             USDC_TOKEN_DECIMALS
           );
-          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(extendedHoldings, extendedPositions[0], params.amount);
-          logger.info(`positionAmountToClose: ${positionAmountToClose.toNumber()}`);
+          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(
+            extendedHoldings,
+            extendedPositions[0],
+            params.amount
+          );
+          logger.info(
+            `positionAmountToClose: ${positionAmountToClose} this is without leverage`
+          );
           logger.info(
             `${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`
           );
@@ -35356,7 +35365,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           avnuAdapter,
           "close" /* CLOSE */
         );
-        if (!isPriceDifferenceBetweenAvnuAndExtended) {
+        if (!isPriceDifferenceBetweenAvnuAndExtended && params.cycleType === "WITHDRAWAL" /* WITHDRAWAL */) {
           logger.warn(
             `price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.24",
+  "version": "2.0.0-dev.26",
   "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/vesu-extended-strategy/utils/helper.ts

@@ -403,8 +403,7 @@ export const calculateVesUPositionSizeGivenExtended = (
   extendedPositonValue: number,
   extendedHoldingAmount: Web3Number,
   collateralAmount: Web3Number,
-  collateralPrice: number,
-  vesuDebtAmountToBeRepaid: Web3Number
+  collateralPrice: number
 ) => {
   const extendedLeverage = calculateExtendedLevergae();
   const vesuLeverage = calculateVesuLeverage();
@@ -419,7 +418,6 @@ export const calculateVesUPositionSizeGivenExtended = (
   const vesuAmountInUsd = numerator1
     .plus(numerator2)
     .dividedBy(vesuLeverage)
-    .plus(vesuDebtAmountToBeRepaid);
   const vesuAmountInBTC = vesuAmountInUsd
     .dividedBy(collateralPrice)
     .toFixed(WBTC_TOKEN_DECIMALS);
@@ -451,14 +449,17 @@ export const calculateDeltaDebtAmount = (
   try {
     const term1 = existingVesuCollateral
       .multipliedBy(collateralPrice)
-      .multipliedBy(maxLtv)
-      .dividedBy(targetHf);
+      .multipliedBy(maxLtv);
+
+    logger.info(`term1: ${term1.toNumber()}`);
     const term2 = existingVesuDebt
       .multipliedBy(debtPrice)
       .multipliedBy(targetHf)
       .multipliedBy(-1);
+    logger.info(`term2: ${term2.toNumber()}`);
     const debtAmountToBeRepaid = term1.plus(term2).dividedBy(targetHf);
-    return debtAmountToBeRepaid;
+    logger.info(`debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`);
+    return new Web3Number(debtAmountToBeRepaid.toFixed(USDC_TOKEN_DECIMALS), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(`error calculating delta position: ${err}`);
     return null;
@@ -471,21 +472,19 @@ export const calculatePositionToCloseToWithdrawAmount = async (
   amountToWithdraw: Web3Number
 ) => {
   try {
+    const extendedLeverage = calculateExtendedLevergae();
     const extendedPosition = extendedPositions.value;
-    const unrealisedPnl = new Web3Number(
-      extendedBalance.unrealisedPnl,
-      USDC_TOKEN_DECIMALS
-    );
-    const availableForWithdrawal = new Web3Number(
-      extendedBalance.availableForWithdrawal,
-      USDC_TOKEN_DECIMALS
-    );
-    const netAmount = amountToWithdraw.minus(availableForWithdrawal);
-    const upnlPercent = unrealisedPnl.dividedBy(extendedPosition);
-    console.log(`upnlPercent: ${upnlPercent}`);
-    const denm = upnlPercent.multipliedBy(3).plus(1);
-    const amountToClose = netAmount.multipliedBy(3).dividedBy(denm);
-    return new Web3Number(Math.ceil(amountToClose.toNumber()), USDC_TOKEN_DECIMALS);
+    const marginRequired = new Web3Number(extendedBalance.initialMargin , USDC_TOKEN_DECIMALS);
+    const unrealisedPnl = new Web3Number(extendedBalance.unrealisedPnl, USDC_TOKEN_DECIMALS);
+    const availableForWithdrawal = new Web3Number(extendedBalance.availableForWithdrawal, USDC_TOKEN_DECIMALS);
+    const upnlPercent = unrealisedPnl.dividedBy(extendedPosition)
+    /**
+     * New Formula
+     */
+    const walletBalance = new Web3Number(extendedBalance.balance, USDC_TOKEN_DECIMALS);
+    const term1 = marginRequired.minus(walletBalance).minus(availableForWithdrawal).plus(amountToWithdraw).multipliedBy(extendedLeverage);
+    const denominator = upnlPercent.multipliedBy(extendedLeverage).plus(1);
+    return new Web3Number(Math.ceil(term1.dividedBy(denominator).dividedBy(extendedLeverage).toNumber()), USDC_TOKEN_DECIMALS);
   } catch (err) {
     logger.error(
       `error calculating position to close to withdraw amount: ${err}`

package/src/strategies/vesu-extended-strategy/vesu-extended-strategy.tsx

@@ -8,7 +8,12 @@ import {
   UNIVERSAL_MANAGE_IDS,
   UniversalStrategySettings,
 } from "../universal-strategy";
-import { calculateDebtAmount, calculateDeltaDebtAmount, calculateExtendedLevergae, calculatePositionToCloseToWithdrawAmount } from "./utils/helper";
+import {
+  calculateDebtAmount,
+  calculateDeltaDebtAmount,
+  calculateExtendedLevergae,
+  calculatePositionToCloseToWithdrawAmount,
+} from "./utils/helper";
 import { logger } from "@/utils";
 import { AUDIT_URL } from "../universal-lst-muliplier-strategy";
 import { getNoRiskTags } from "@/interfaces";
@@ -410,7 +415,7 @@ export class VesuExtendedMultiplierStrategy<
       logger.info(
         `${VesuExtendedMultiplierStrategy.name}::shouldInvest amountToInvest: ${amountToInvestNumber}`
       );
-      
+
       if (amountToInvest.lessThan(LIMIT_BALANCE_VALUE)) {
         return {
           shouldInvest: false,
@@ -498,7 +503,17 @@ export class VesuExtendedMultiplierStrategy<
           debtAmountToBeRepaid: new Web3Number(0, 0),
         };
       }
-      const amountToInvestAfterRepayingDebt = amountToInvest.minus(debtAmountToBeRepaid);
+      logger.info(
+        `${
+          VesuExtendedMultiplierStrategy.name
+        }::shouldInvest debtAmountToBeRepaid: ${debtAmountToBeRepaid.toNumber()}`
+      );
+      /**
+       * Since the debt amount is negative, we need to add it to the amount to invest
+       * to maintain the ltv
+       */
+      const amountToInvestAfterRepayingDebt =
+        amountToInvest.plus(debtAmountToBeRepaid);
       const { vesu_amount, extended_amount, extended_leverage, vesu_leverage } =
         await calculateAmountDistribution(
           amountToInvestAfterRepayingDebt.toNumber(),
@@ -1144,7 +1159,9 @@ export class VesuExtendedMultiplierStrategy<
         );
         const extendedPositions = await extendedAdapter.getAllOpenPositions();
         if (!extendedPositions) {
-          logger.error(`error getting extended positions: ${extendedPositions} while moving assets from extended to vault`);
+          logger.error(
+            `error getting extended positions: ${extendedPositions} while moving assets from extended to vault`
+          );
           return this.createTransactionResult(
             [],
             false,
@@ -1160,8 +1177,15 @@ export class VesuExtendedMultiplierStrategy<
             ),
             USDC_TOKEN_DECIMALS
           );
-          const positionAmountToClose = await calculatePositionToCloseToWithdrawAmount(extendedHoldings, extendedPositions[0], params.amount);
-          logger.info(`positionAmountToClose: ${positionAmountToClose.toNumber()}`);
+          const positionAmountToClose =
+            await calculatePositionToCloseToWithdrawAmount(
+              extendedHoldings,
+              extendedPositions[0],
+              params.amount
+            );
+          logger.info(
+            `positionAmountToClose: ${positionAmountToClose} this is without leverage`
+          );
           logger.info(
             `${
               VesuExtendedMultiplierStrategy.name
@@ -1177,8 +1201,7 @@ export class VesuExtendedMultiplierStrategy<
             logger.error(`error fetching order book btc usdc: ${status}`);
             priceOfBTC = collateralPrice.price;
           }
-          const btcAmount =
-            positionAmountToClose.dividedBy(priceOfBTC);
+          const btcAmount = positionAmountToClose.dividedBy(priceOfBTC);
           /**
            * If amount for withdrawal is greater than the amount in extended available for withdrawal,
            * then we need to open a long position depending on the difference between the two
@@ -1303,7 +1326,10 @@ export class VesuExtendedMultiplierStrategy<
             avnuAdapter,
             PositionTypeAvnuExtended.CLOSE
           );
-        if (!isPriceDifferenceBetweenAvnuAndExtended) {
+        if (
+          !isPriceDifferenceBetweenAvnuAndExtended &&
+          params.cycleType === CycleType.WITHDRAWAL
+        ) {
           logger.warn(
             `price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`
           );