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

package/dist/index.browser.global.js

@@ -92648,21 +92648,17 @@ 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}`
@@ -99260,7 +99256,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 +99274,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()}`
             );

package/dist/index.browser.mjs

@@ -28603,21 +28603,17 @@ 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}`
@@ -35222,7 +35218,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 +35236,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()}`
           );

package/dist/index.js

@@ -28407,21 +28407,17 @@ 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}`
@@ -35381,7 +35377,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 +35395,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()}`
           );

package/dist/index.mjs

@@ -28259,21 +28259,17 @@ 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}`
@@ -35233,7 +35229,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 +35247,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()}`
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.24",
+  "version": "2.0.0-dev.25",
   "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

@@ -471,21 +471,20 @@ 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);
+    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);
+    /**
+     * 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,8 @@ export class VesuExtendedMultiplierStrategy<
           debtAmountToBeRepaid: new Web3Number(0, 0),
         };
       }
-      const amountToInvestAfterRepayingDebt = amountToInvest.minus(debtAmountToBeRepaid);
+      const amountToInvestAfterRepayingDebt =
+        amountToInvest.minus(debtAmountToBeRepaid);
       const { vesu_amount, extended_amount, extended_leverage, vesu_leverage } =
         await calculateAmountDistribution(
           amountToInvestAfterRepayingDebt.toNumber(),
@@ -1144,7 +1150,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 +1168,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 +1192,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