@strkfarm/sdk 2.0.0-dev.2 → 2.0.0-dev.4

package/dist/index.browser.global.js

@@ -55997,20 +55997,13 @@ ${JSON.stringify(data, null, 2)}`;
     async getDexPrice(baseToken, quoteToken, amount) {
       const lstTokenInfo = baseToken;
       const lstUnderlyingTokenInfo = quoteToken;
-      console.log("lstTokenInfo", lstTokenInfo);
-      console.log("lstUnderlyingTokenInfo", lstUnderlyingTokenInfo);
-      console.log("amount", amount);
       const quote = await this.getQuote(
         lstTokenInfo.address.address,
         lstUnderlyingTokenInfo.address.address,
         amount
       );
-      console.log("quote", quote);
       const outputAmount = Web3Number.fromWei(quote.total_calculated, lstUnderlyingTokenInfo.decimals);
-      console.log("outputAmount", outputAmount);
-      console.log("amount", amount);
       const price = outputAmount.toNumber() / amount.toNumber();
-      console.log("price", price);
       logger2.verbose(`${_EkuboQuoter.name}:: LST Dex Price: ${price}`);
       return price;
     }
@@ -56029,16 +56022,12 @@ ${JSON.stringify(data, null, 2)}`;
     // debt collateral 
     async getSwapLimitAmount(fromToken, toToken, amount, max_slippage = 2e-3) {
       const isExactAmountIn = amount.greaterThanOrEqualTo(0);
-      console.log("isExactAmountIn", isExactAmountIn);
       logger2.verbose(`${_EkuboQuoter.name}::getSwapLimitAmount isExactAmountIn: ${isExactAmountIn}, fromToken: ${fromToken.symbol}, toToken: ${toToken.symbol}, amount: ${amount}`);
       const isYieldToken = this.tokenMarketData.isAPYSupported(toToken);
       console.log("isYieldToken", isYieldToken);
       const baseToken = isExactAmountIn ? toToken : fromToken;
       const quoteToken = isExactAmountIn ? fromToken : toToken;
-      console.log("baseToken", baseToken);
-      console.log("quoteToken", quoteToken);
       const dexPrice = await this.getDexPrice(baseToken, quoteToken, amount);
-      console.log("dexPrice", dexPrice);
       const trueExchangeRate = isYieldToken ? await this.tokenMarketData.getTruePrice(baseToken) : dexPrice;
       console.log("trueExchangeRate", trueExchangeRate);
       if (isExactAmountIn) {
@@ -56069,7 +56058,6 @@ ${JSON.stringify(data, null, 2)}`;
       return quote.splits.map((split2) => {
         const isNegativeAmount = BigInt(split2.amount_specified) <= 0n;
         const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-        console.log("token for withdrawal", token, isNegativeAmount);
         return {
           route: split2.route.map((_route) => ({
             pool_key: {
@@ -92469,7 +92457,6 @@ spurious results.`);
         return null;
       }
       const extendedExposureUSD = extendedPosition.length > 0 ? new Web3Number(extendedPosition[0].value, USDC_TOKEN_DECIMALS) : new Web3Number(0, USDC_TOKEN_DECIMALS);
-      console.log("THe collateral is", collateralPrice, collateralUnits);
       const vesuExposureUSD = collateralUnits.multipliedBy(collateralPrice);
       if (vesuExposureUSD.lessThan(0)) {
         return {
@@ -92526,10 +92513,10 @@ spurious results.`);
     const extended_leverage_max = 1 / (MAINTENANCE_MARGIN + MAX_PRICE_DROP_PERCENTAGE);
     return Math.floor(extended_leverage_max);
   };
-  var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LTV_BTC_USDC, addedAmount, collateralPrice, isDeposit) => {
+  var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LIQUIDATION_RATIO, addedAmount, collateralPrice, isDeposit) => {
     try {
-      const marginAmount = addedAmount.multipliedBy(isDeposit ? 1 : -1);
-      const numerator1 = collateralAmount.plus(addedAmount).multipliedBy(collateralPrice).multipliedBy(maxLtv);
+      const addedCollateral = addedAmount.multipliedBy(isDeposit ? 1 : -1);
+      const numerator1 = collateralAmount.plus(addedCollateral).multipliedBy(collateralPrice).multipliedBy(maxLtv);
       const numerator2 = debtAmount.multipliedBy(debtPrice).multipliedBy(TARGET_HF);
       const denominator = TARGET_HF - maxLtv;
       const x_debt_usd = numerator1.minus(numerator2).dividedBy(denominator);
@@ -92564,16 +92551,16 @@ spurious results.`);
       const extendedHoldings = await client.getHoldings();
       const extended_leverage = calculateExtendedLevergae();
       const latestPosition = (await client.getPositions()).data.pop();
-      console.log("the latest position is", latestPosition, extendedHoldings);
       if (!extendedHoldings || !latestPosition) {
         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;
     }
   };
@@ -97667,7 +97654,7 @@ spurious results.`);
       }
       throw new Error("Failed to fetch quote after retries");
     }
-    async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e4) {
+    async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e3) {
       try {
         const fromToken = this.config.supportedPositions[0].asset;
         const toToken = this.config.supportedPositions[1].asset;
@@ -98039,15 +98026,15 @@ spurious results.`);
         }
         const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
         const usdcAmountOnExtended = parseFloat(
-          extendedHoldings.availableForWithdrawal
+          extendedHoldings.availableForTrade
         );
-        if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
+        if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
           try {
             const { calls: extendedCalls } = await this.moveAssets(
               {
                 to: Protocols.EXTENDED.name,
                 from: Protocols.VAULT.name,
-                amount: extendedAmount.minus(usdcAmountOnExtended)
+                amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended)
               },
               extendedAdapter,
               vesuAdapter
@@ -98127,21 +98114,30 @@ spurious results.`);
             extendedHoldings.availableForWithdrawal,
             USDC_TOKEN_DECIMALS
           );
-          const leftAmountAfterWithdrawalAmountInAccount = params.amount.minus(extendedHoldingAmount);
-          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
-          const openLongPosition = await extendedAdapter.createOrder(
-            extendedLeverage.toString(),
-            btcAmount.toNumber(),
-            "BUY" /* BUY */
-          );
-          if (!openLongPosition) {
-            logger2.error(`error opening long position: ${openLongPosition}`);
-            return {
-              calls: [],
-              status: false
-            };
+          logger2.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
+          if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
+            const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+            logger2.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
+            const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+            const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
+              extendedLeverage.toString(),
+              btcAmount.toNumber(),
+              "BUY" /* BUY */
+            ) : await extendedAdapter.createOrder(
+              extendedLeverage.toString(),
+              35e-6,
+              // just in case amount falls short then we need to create a withdrawal
+              "BUY" /* BUY */
+            );
+            if (!openLongPosition) {
+              logger2.error(`error opening long position: ${openLongPosition}`);
+              return {
+                calls: [],
+                status: false
+              };
+            }
+            await new Promise((resolve) => setTimeout(resolve, 5e3));
           }
-          await new Promise((resolve) => setTimeout(resolve, 5e3));
           const withdrawalFromExtended = await extendedAdapter.withdrawFromExtended(params.amount);
           if (withdrawalFromExtended) {
             const extendedHoldings2 = await extendedAdapter.getExtendedDepositAmount();
@@ -98266,6 +98262,7 @@ spurious results.`);
           };
         }
         const extendedPositionValue = position.length > 0 ? parseFloat(position[0].value) : 0;
+        const BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE = BUFFER_USDC_IN_WITHDRAWAL;
         const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
         if (!extendedHoldings) {
           logger2.error(`error getting extended holdings: ${extendedHoldings}`);
@@ -98275,7 +98272,7 @@ spurious results.`);
           };
         }
         const extendedHoldingAmount = new Web3Number(
-          extendedHoldings.availableForWithdrawal,
+          extendedHoldings.availableForTrade,
           USDC_TOKEN_DECIMALS
         );
         const {
@@ -98284,7 +98281,7 @@ spurious results.`);
         const { collateralPrice } = await this.getAssetPrices();
         const { vesuAmountInBTC, extendedAmountInBTC } = calculateVesUPositionSizeGivenExtended(
           extendedPositionValue,
-          extendedHoldingAmount,
+          extendedHoldingAmount.minus(BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE),
           collateralTokenAmount,
           collateralPrice.price
         );
@@ -98301,7 +98298,6 @@ spurious results.`);
           );
           const { amount: wbtcAmountInVaultAllocator } = await this.getUnusedBalanceWBTC();
           if (wbtcAmountInVaultAllocator.lessThan(vesuAmountInBTC)) {
-            logger2.info(`WBTC amount in vault allocator is less than vesu amount required in WBTC thus swapping, wbtcAmountInVaultAllocator: ${wbtcAmountInVaultAllocator}, vesuAmountInBTC: ${vesuAmountInBTC}`);
             const swapProofsInfo = avnuAdapter.getProofs(true, this.getMerkleTree());
             const swapProofGroups = swapProofsInfo.proofs;
             const swapCall = this.getManageCall(

package/dist/index.browser.mjs

@@ -4269,20 +4269,13 @@ var EkuboQuoter = class _EkuboQuoter {
   async getDexPrice(baseToken, quoteToken, amount) {
     const lstTokenInfo = baseToken;
     const lstUnderlyingTokenInfo = quoteToken;
-    console.log("lstTokenInfo", lstTokenInfo);
-    console.log("lstUnderlyingTokenInfo", lstUnderlyingTokenInfo);
-    console.log("amount", amount);
     const quote = await this.getQuote(
       lstTokenInfo.address.address,
       lstUnderlyingTokenInfo.address.address,
       amount
     );
-    console.log("quote", quote);
     const outputAmount = Web3Number.fromWei(quote.total_calculated, lstUnderlyingTokenInfo.decimals);
-    console.log("outputAmount", outputAmount);
-    console.log("amount", amount);
     const price = outputAmount.toNumber() / amount.toNumber();
-    console.log("price", price);
     logger.verbose(`${_EkuboQuoter.name}:: LST Dex Price: ${price}`);
     return price;
   }
@@ -4301,16 +4294,12 @@ var EkuboQuoter = class _EkuboQuoter {
   // debt collateral 
   async getSwapLimitAmount(fromToken, toToken, amount, max_slippage = 2e-3) {
     const isExactAmountIn = amount.greaterThanOrEqualTo(0);
-    console.log("isExactAmountIn", isExactAmountIn);
     logger.verbose(`${_EkuboQuoter.name}::getSwapLimitAmount isExactAmountIn: ${isExactAmountIn}, fromToken: ${fromToken.symbol}, toToken: ${toToken.symbol}, amount: ${amount}`);
     const isYieldToken = this.tokenMarketData.isAPYSupported(toToken);
     console.log("isYieldToken", isYieldToken);
     const baseToken = isExactAmountIn ? toToken : fromToken;
     const quoteToken = isExactAmountIn ? fromToken : toToken;
-    console.log("baseToken", baseToken);
-    console.log("quoteToken", quoteToken);
     const dexPrice = await this.getDexPrice(baseToken, quoteToken, amount);
-    console.log("dexPrice", dexPrice);
     const trueExchangeRate = isYieldToken ? await this.tokenMarketData.getTruePrice(baseToken) : dexPrice;
     console.log("trueExchangeRate", trueExchangeRate);
     if (isExactAmountIn) {
@@ -4341,7 +4330,6 @@ var EkuboQuoter = class _EkuboQuoter {
     return quote.splits.map((split) => {
       const isNegativeAmount = BigInt(split.amount_specified) <= 0n;
       const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-      console.log("token for withdrawal", token, isNegativeAmount);
       return {
         route: split.route.map((_route) => ({
           pool_key: {
@@ -28440,7 +28428,6 @@ var calculateAmountDistributionForWithdrawal = async (amountInUsdc, collateralPr
       return null;
     }
     const extendedExposureUSD = extendedPosition.length > 0 ? new Web3Number(extendedPosition[0].value, USDC_TOKEN_DECIMALS) : new Web3Number(0, USDC_TOKEN_DECIMALS);
-    console.log("THe collateral is", collateralPrice, collateralUnits);
     const vesuExposureUSD = collateralUnits.multipliedBy(collateralPrice);
     if (vesuExposureUSD.lessThan(0)) {
       return {
@@ -28497,10 +28484,10 @@ var calculateExtendedLevergae = () => {
   const extended_leverage_max = 1 / (MAINTENANCE_MARGIN + MAX_PRICE_DROP_PERCENTAGE);
   return Math.floor(extended_leverage_max);
 };
-var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LTV_BTC_USDC, addedAmount, collateralPrice, isDeposit) => {
+var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LIQUIDATION_RATIO, addedAmount, collateralPrice, isDeposit) => {
   try {
-    const marginAmount = addedAmount.multipliedBy(isDeposit ? 1 : -1);
-    const numerator1 = collateralAmount.plus(addedAmount).multipliedBy(collateralPrice).multipliedBy(maxLtv);
+    const addedCollateral = addedAmount.multipliedBy(isDeposit ? 1 : -1);
+    const numerator1 = collateralAmount.plus(addedCollateral).multipliedBy(collateralPrice).multipliedBy(maxLtv);
     const numerator2 = debtAmount.multipliedBy(debtPrice).multipliedBy(TARGET_HF);
     const denominator = TARGET_HF - maxLtv;
     const x_debt_usd = numerator1.minus(numerator2).dividedBy(denominator);
@@ -28535,16 +28522,16 @@ var calculateAmountDepositOnExtendedWhenIncurringLosses = async (client) => {
     const extendedHoldings = await client.getHoldings();
     const extended_leverage = calculateExtendedLevergae();
     const latestPosition = (await client.getPositions()).data.pop();
-    console.log("the latest position is", latestPosition, extendedHoldings);
     if (!extendedHoldings || !latestPosition) {
       logger.error(`error getting extended position: extendedHoldings=${extendedHoldings}, latestPosition=${latestPosition}`);
       return null;
     }
-    const positionValueInUSD = latestPosition.value;
+    const positionValueInUSD = new Web3Number(latestPosition.value, USDC_TOKEN_DECIMALS);
     const equity = extendedHoldings.data.equity;
-    const deposit = Number(positionValueInUSD) / extended_leverage - Number(equity);
-    return new Web3Number(Math.floor(deposit / 0.2) * 0.2, USDC_TOKEN_DECIMALS);
+    const deposit = positionValueInUSD.dividedBy(extended_leverage).minus(equity).toFixed(2);
+    return new Web3Number(deposit, USDC_TOKEN_DECIMALS);
   } catch (err) {
+    logger.error(`error calculating amount deposit on extended when incurring losses: ${err}`);
     return null;
   }
 };
@@ -33645,7 +33632,7 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
     }
     throw new Error("Failed to fetch quote after retries");
   }
-  async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e4) {
+  async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e3) {
     try {
       const fromToken = this.config.supportedPositions[0].asset;
       const toToken = this.config.supportedPositions[1].asset;
@@ -34017,15 +34004,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
       const usdcAmountOnExtended = parseFloat(
-        extendedHoldings.availableForWithdrawal
+        extendedHoldings.availableForTrade
       );
-      if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
+      if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
         try {
           const { calls: extendedCalls } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VAULT.name,
-              amount: extendedAmount.minus(usdcAmountOnExtended)
+              amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended)
             },
             extendedAdapter,
             vesuAdapter
@@ -34105,21 +34092,30 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           extendedHoldings.availableForWithdrawal,
           USDC_TOKEN_DECIMALS
         );
-        const leftAmountAfterWithdrawalAmountInAccount = params.amount.minus(extendedHoldingAmount);
-        const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
-        const openLongPosition = await extendedAdapter.createOrder(
-          extendedLeverage.toString(),
-          btcAmount.toNumber(),
-          "BUY" /* BUY */
-        );
-        if (!openLongPosition) {
-          logger.error(`error opening long position: ${openLongPosition}`);
-          return {
-            calls: [],
-            status: false
-          };
+        logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
+        if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
+          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            btcAmount.toNumber(),
+            "BUY" /* BUY */
+          ) : await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            35e-6,
+            // just in case amount falls short then we need to create a withdrawal
+            "BUY" /* BUY */
+          );
+          if (!openLongPosition) {
+            logger.error(`error opening long position: ${openLongPosition}`);
+            return {
+              calls: [],
+              status: false
+            };
+          }
+          await new Promise((resolve) => setTimeout(resolve, 5e3));
         }
-        await new Promise((resolve) => setTimeout(resolve, 5e3));
         const withdrawalFromExtended = await extendedAdapter.withdrawFromExtended(params.amount);
         if (withdrawalFromExtended) {
           const extendedHoldings2 = await extendedAdapter.getExtendedDepositAmount();
@@ -34244,6 +34240,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedPositionValue = position.length > 0 ? parseFloat(position[0].value) : 0;
+      const BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE = BUFFER_USDC_IN_WITHDRAWAL;
       const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
       if (!extendedHoldings) {
         logger.error(`error getting extended holdings: ${extendedHoldings}`);
@@ -34253,7 +34250,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForWithdrawal,
+        extendedHoldings.availableForTrade,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -34262,7 +34259,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const { collateralPrice } = await this.getAssetPrices();
       const { vesuAmountInBTC, extendedAmountInBTC } = calculateVesUPositionSizeGivenExtended(
         extendedPositionValue,
-        extendedHoldingAmount,
+        extendedHoldingAmount.minus(BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE),
         collateralTokenAmount,
         collateralPrice.price
       );
@@ -34279,7 +34276,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         const { amount: wbtcAmountInVaultAllocator } = await this.getUnusedBalanceWBTC();
         if (wbtcAmountInVaultAllocator.lessThan(vesuAmountInBTC)) {
-          logger.info(`WBTC amount in vault allocator is less than vesu amount required in WBTC thus swapping, wbtcAmountInVaultAllocator: ${wbtcAmountInVaultAllocator}, vesuAmountInBTC: ${vesuAmountInBTC}`);
           const swapProofsInfo = avnuAdapter.getProofs(true, this.getMerkleTree());
           const swapProofGroups = swapProofsInfo.proofs;
           const swapCall = this.getManageCall(

package/dist/index.js

@@ -4474,20 +4474,13 @@ var EkuboQuoter = class _EkuboQuoter {
   async getDexPrice(baseToken, quoteToken, amount) {
     const lstTokenInfo = baseToken;
     const lstUnderlyingTokenInfo = quoteToken;
-    console.log("lstTokenInfo", lstTokenInfo);
-    console.log("lstUnderlyingTokenInfo", lstUnderlyingTokenInfo);
-    console.log("amount", amount);
     const quote = await this.getQuote(
       lstTokenInfo.address.address,
       lstUnderlyingTokenInfo.address.address,
       amount
     );
-    console.log("quote", quote);
     const outputAmount = Web3Number.fromWei(quote.total_calculated, lstUnderlyingTokenInfo.decimals);
-    console.log("outputAmount", outputAmount);
-    console.log("amount", amount);
     const price = outputAmount.toNumber() / amount.toNumber();
-    console.log("price", price);
     logger.verbose(`${_EkuboQuoter.name}:: LST Dex Price: ${price}`);
     return price;
   }
@@ -4506,16 +4499,12 @@ var EkuboQuoter = class _EkuboQuoter {
   // debt collateral 
   async getSwapLimitAmount(fromToken, toToken, amount, max_slippage = 2e-3) {
     const isExactAmountIn = amount.greaterThanOrEqualTo(0);
-    console.log("isExactAmountIn", isExactAmountIn);
     logger.verbose(`${_EkuboQuoter.name}::getSwapLimitAmount isExactAmountIn: ${isExactAmountIn}, fromToken: ${fromToken.symbol}, toToken: ${toToken.symbol}, amount: ${amount}`);
     const isYieldToken = this.tokenMarketData.isAPYSupported(toToken);
     console.log("isYieldToken", isYieldToken);
     const baseToken = isExactAmountIn ? toToken : fromToken;
     const quoteToken = isExactAmountIn ? fromToken : toToken;
-    console.log("baseToken", baseToken);
-    console.log("quoteToken", quoteToken);
     const dexPrice = await this.getDexPrice(baseToken, quoteToken, amount);
-    console.log("dexPrice", dexPrice);
     const trueExchangeRate = isYieldToken ? await this.tokenMarketData.getTruePrice(baseToken) : dexPrice;
     console.log("trueExchangeRate", trueExchangeRate);
     if (isExactAmountIn) {
@@ -4546,7 +4535,6 @@ var EkuboQuoter = class _EkuboQuoter {
     return quote.splits.map((split) => {
       const isNegativeAmount = BigInt(split.amount_specified) <= 0n;
       const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-      console.log("token for withdrawal", token, isNegativeAmount);
       return {
         route: split.route.map((_route) => ({
           pool_key: {
@@ -28257,7 +28245,6 @@ var calculateAmountDistributionForWithdrawal = async (amountInUsdc, collateralPr
       return null;
     }
     const extendedExposureUSD = extendedPosition.length > 0 ? new Web3Number(extendedPosition[0].value, USDC_TOKEN_DECIMALS) : new Web3Number(0, USDC_TOKEN_DECIMALS);
-    console.log("THe collateral is", collateralPrice, collateralUnits);
     const vesuExposureUSD = collateralUnits.multipliedBy(collateralPrice);
     if (vesuExposureUSD.lessThan(0)) {
       return {
@@ -28314,10 +28301,10 @@ var calculateExtendedLevergae = () => {
   const extended_leverage_max = 1 / (MAINTENANCE_MARGIN + MAX_PRICE_DROP_PERCENTAGE);
   return Math.floor(extended_leverage_max);
 };
-var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LTV_BTC_USDC, addedAmount, collateralPrice, isDeposit) => {
+var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LIQUIDATION_RATIO, addedAmount, collateralPrice, isDeposit) => {
   try {
-    const marginAmount = addedAmount.multipliedBy(isDeposit ? 1 : -1);
-    const numerator1 = collateralAmount.plus(addedAmount).multipliedBy(collateralPrice).multipliedBy(maxLtv);
+    const addedCollateral = addedAmount.multipliedBy(isDeposit ? 1 : -1);
+    const numerator1 = collateralAmount.plus(addedCollateral).multipliedBy(collateralPrice).multipliedBy(maxLtv);
     const numerator2 = debtAmount.multipliedBy(debtPrice).multipliedBy(TARGET_HF);
     const denominator = TARGET_HF - maxLtv;
     const x_debt_usd = numerator1.minus(numerator2).dividedBy(denominator);
@@ -28352,16 +28339,16 @@ var calculateAmountDepositOnExtendedWhenIncurringLosses = async (client) => {
     const extendedHoldings = await client.getHoldings();
     const extended_leverage = calculateExtendedLevergae();
     const latestPosition = (await client.getPositions()).data.pop();
-    console.log("the latest position is", latestPosition, extendedHoldings);
     if (!extendedHoldings || !latestPosition) {
       logger.error(`error getting extended position: extendedHoldings=${extendedHoldings}, latestPosition=${latestPosition}`);
       return null;
     }
-    const positionValueInUSD = latestPosition.value;
+    const positionValueInUSD = new Web3Number(latestPosition.value, USDC_TOKEN_DECIMALS);
     const equity = extendedHoldings.data.equity;
-    const deposit = Number(positionValueInUSD) / extended_leverage - Number(equity);
-    return new Web3Number(Math.floor(deposit / 0.2) * 0.2, USDC_TOKEN_DECIMALS);
+    const deposit = positionValueInUSD.dividedBy(extended_leverage).minus(equity).toFixed(2);
+    return new Web3Number(deposit, USDC_TOKEN_DECIMALS);
   } catch (err) {
+    logger.error(`error calculating amount deposit on extended when incurring losses: ${err}`);
     return null;
   }
 };
@@ -33798,7 +33785,7 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
     }
     throw new Error("Failed to fetch quote after retries");
   }
-  async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e4) {
+  async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e3) {
     try {
       const fromToken = this.config.supportedPositions[0].asset;
       const toToken = this.config.supportedPositions[1].asset;
@@ -34170,15 +34157,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
       const usdcAmountOnExtended = parseFloat(
-        extendedHoldings.availableForWithdrawal
+        extendedHoldings.availableForTrade
       );
-      if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
+      if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
         try {
           const { calls: extendedCalls } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VAULT.name,
-              amount: extendedAmount.minus(usdcAmountOnExtended)
+              amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended)
             },
             extendedAdapter,
             vesuAdapter
@@ -34258,21 +34245,30 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           extendedHoldings.availableForWithdrawal,
           USDC_TOKEN_DECIMALS
         );
-        const leftAmountAfterWithdrawalAmountInAccount = params.amount.minus(extendedHoldingAmount);
-        const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
-        const openLongPosition = await extendedAdapter.createOrder(
-          extendedLeverage.toString(),
-          btcAmount.toNumber(),
-          "BUY" /* BUY */
-        );
-        if (!openLongPosition) {
-          logger.error(`error opening long position: ${openLongPosition}`);
-          return {
-            calls: [],
-            status: false
-          };
+        logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
+        if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
+          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            btcAmount.toNumber(),
+            "BUY" /* BUY */
+          ) : await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            35e-6,
+            // just in case amount falls short then we need to create a withdrawal
+            "BUY" /* BUY */
+          );
+          if (!openLongPosition) {
+            logger.error(`error opening long position: ${openLongPosition}`);
+            return {
+              calls: [],
+              status: false
+            };
+          }
+          await new Promise((resolve) => setTimeout(resolve, 5e3));
         }
-        await new Promise((resolve) => setTimeout(resolve, 5e3));
         const withdrawalFromExtended = await extendedAdapter.withdrawFromExtended(params.amount);
         if (withdrawalFromExtended) {
           const extendedHoldings2 = await extendedAdapter.getExtendedDepositAmount();
@@ -34397,6 +34393,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedPositionValue = position.length > 0 ? parseFloat(position[0].value) : 0;
+      const BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE = BUFFER_USDC_IN_WITHDRAWAL;
       const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
       if (!extendedHoldings) {
         logger.error(`error getting extended holdings: ${extendedHoldings}`);
@@ -34406,7 +34403,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForWithdrawal,
+        extendedHoldings.availableForTrade,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -34415,7 +34412,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const { collateralPrice } = await this.getAssetPrices();
       const { vesuAmountInBTC, extendedAmountInBTC } = calculateVesUPositionSizeGivenExtended(
         extendedPositionValue,
-        extendedHoldingAmount,
+        extendedHoldingAmount.minus(BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE),
         collateralTokenAmount,
         collateralPrice.price
       );
@@ -34432,7 +34429,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         const { amount: wbtcAmountInVaultAllocator } = await this.getUnusedBalanceWBTC();
         if (wbtcAmountInVaultAllocator.lessThan(vesuAmountInBTC)) {
-          logger.info(`WBTC amount in vault allocator is less than vesu amount required in WBTC thus swapping, wbtcAmountInVaultAllocator: ${wbtcAmountInVaultAllocator}, vesuAmountInBTC: ${vesuAmountInBTC}`);
           const swapProofsInfo = avnuAdapter.getProofs(true, this.getMerkleTree());
           const swapProofGroups = swapProofsInfo.proofs;
           const swapCall = this.getManageCall(

package/dist/index.mjs

@@ -4328,20 +4328,13 @@ var EkuboQuoter = class _EkuboQuoter {
   async getDexPrice(baseToken, quoteToken, amount) {
     const lstTokenInfo = baseToken;
     const lstUnderlyingTokenInfo = quoteToken;
-    console.log("lstTokenInfo", lstTokenInfo);
-    console.log("lstUnderlyingTokenInfo", lstUnderlyingTokenInfo);
-    console.log("amount", amount);
     const quote = await this.getQuote(
       lstTokenInfo.address.address,
       lstUnderlyingTokenInfo.address.address,
       amount
     );
-    console.log("quote", quote);
     const outputAmount = Web3Number.fromWei(quote.total_calculated, lstUnderlyingTokenInfo.decimals);
-    console.log("outputAmount", outputAmount);
-    console.log("amount", amount);
     const price = outputAmount.toNumber() / amount.toNumber();
-    console.log("price", price);
     logger.verbose(`${_EkuboQuoter.name}:: LST Dex Price: ${price}`);
     return price;
   }
@@ -4360,16 +4353,12 @@ var EkuboQuoter = class _EkuboQuoter {
   // debt collateral 
   async getSwapLimitAmount(fromToken, toToken, amount, max_slippage = 2e-3) {
     const isExactAmountIn = amount.greaterThanOrEqualTo(0);
-    console.log("isExactAmountIn", isExactAmountIn);
     logger.verbose(`${_EkuboQuoter.name}::getSwapLimitAmount isExactAmountIn: ${isExactAmountIn}, fromToken: ${fromToken.symbol}, toToken: ${toToken.symbol}, amount: ${amount}`);
     const isYieldToken = this.tokenMarketData.isAPYSupported(toToken);
     console.log("isYieldToken", isYieldToken);
     const baseToken = isExactAmountIn ? toToken : fromToken;
     const quoteToken = isExactAmountIn ? fromToken : toToken;
-    console.log("baseToken", baseToken);
-    console.log("quoteToken", quoteToken);
     const dexPrice = await this.getDexPrice(baseToken, quoteToken, amount);
-    console.log("dexPrice", dexPrice);
     const trueExchangeRate = isYieldToken ? await this.tokenMarketData.getTruePrice(baseToken) : dexPrice;
     console.log("trueExchangeRate", trueExchangeRate);
     if (isExactAmountIn) {
@@ -4400,7 +4389,6 @@ var EkuboQuoter = class _EkuboQuoter {
     return quote.splits.map((split) => {
       const isNegativeAmount = BigInt(split.amount_specified) <= 0n;
       const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-      console.log("token for withdrawal", token, isNegativeAmount);
       return {
         route: split.route.map((_route) => ({
           pool_key: {
@@ -28115,7 +28103,6 @@ var calculateAmountDistributionForWithdrawal = async (amountInUsdc, collateralPr
       return null;
     }
     const extendedExposureUSD = extendedPosition.length > 0 ? new Web3Number(extendedPosition[0].value, USDC_TOKEN_DECIMALS) : new Web3Number(0, USDC_TOKEN_DECIMALS);
-    console.log("THe collateral is", collateralPrice, collateralUnits);
     const vesuExposureUSD = collateralUnits.multipliedBy(collateralPrice);
     if (vesuExposureUSD.lessThan(0)) {
       return {
@@ -28172,10 +28159,10 @@ var calculateExtendedLevergae = () => {
   const extended_leverage_max = 1 / (MAINTENANCE_MARGIN + MAX_PRICE_DROP_PERCENTAGE);
   return Math.floor(extended_leverage_max);
 };
-var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LTV_BTC_USDC, addedAmount, collateralPrice, isDeposit) => {
+var calculateDebtAmount = (collateralAmount, debtAmount, debtPrice, maxLtv = MAX_LIQUIDATION_RATIO, addedAmount, collateralPrice, isDeposit) => {
   try {
-    const marginAmount = addedAmount.multipliedBy(isDeposit ? 1 : -1);
-    const numerator1 = collateralAmount.plus(addedAmount).multipliedBy(collateralPrice).multipliedBy(maxLtv);
+    const addedCollateral = addedAmount.multipliedBy(isDeposit ? 1 : -1);
+    const numerator1 = collateralAmount.plus(addedCollateral).multipliedBy(collateralPrice).multipliedBy(maxLtv);
     const numerator2 = debtAmount.multipliedBy(debtPrice).multipliedBy(TARGET_HF);
     const denominator = TARGET_HF - maxLtv;
     const x_debt_usd = numerator1.minus(numerator2).dividedBy(denominator);
@@ -28210,16 +28197,16 @@ var calculateAmountDepositOnExtendedWhenIncurringLosses = async (client) => {
     const extendedHoldings = await client.getHoldings();
     const extended_leverage = calculateExtendedLevergae();
     const latestPosition = (await client.getPositions()).data.pop();
-    console.log("the latest position is", latestPosition, extendedHoldings);
     if (!extendedHoldings || !latestPosition) {
       logger.error(`error getting extended position: extendedHoldings=${extendedHoldings}, latestPosition=${latestPosition}`);
       return null;
     }
-    const positionValueInUSD = latestPosition.value;
+    const positionValueInUSD = new Web3Number(latestPosition.value, USDC_TOKEN_DECIMALS);
     const equity = extendedHoldings.data.equity;
-    const deposit = Number(positionValueInUSD) / extended_leverage - Number(equity);
-    return new Web3Number(Math.floor(deposit / 0.2) * 0.2, USDC_TOKEN_DECIMALS);
+    const deposit = positionValueInUSD.dividedBy(extended_leverage).minus(equity).toFixed(2);
+    return new Web3Number(deposit, USDC_TOKEN_DECIMALS);
   } catch (err) {
+    logger.error(`error calculating amount deposit on extended when incurring losses: ${err}`);
     return null;
   }
 };
@@ -33656,7 +33643,7 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
     }
     throw new Error("Failed to fetch quote after retries");
   }
-  async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e4) {
+  async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 1e3) {
     try {
       const fromToken = this.config.supportedPositions[0].asset;
       const toToken = this.config.supportedPositions[1].asset;
@@ -34028,15 +34015,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
       const usdcAmountOnExtended = parseFloat(
-        extendedHoldings.availableForWithdrawal
+        extendedHoldings.availableForTrade
       );
-      if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
+      if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
         try {
           const { calls: extendedCalls } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VAULT.name,
-              amount: extendedAmount.minus(usdcAmountOnExtended)
+              amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended)
             },
             extendedAdapter,
             vesuAdapter
@@ -34116,21 +34103,30 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           extendedHoldings.availableForWithdrawal,
           USDC_TOKEN_DECIMALS
         );
-        const leftAmountAfterWithdrawalAmountInAccount = params.amount.minus(extendedHoldingAmount);
-        const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
-        const openLongPosition = await extendedAdapter.createOrder(
-          extendedLeverage.toString(),
-          btcAmount.toNumber(),
-          "BUY" /* BUY */
-        );
-        if (!openLongPosition) {
-          logger.error(`error opening long position: ${openLongPosition}`);
-          return {
-            calls: [],
-            status: false
-          };
+        logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
+        if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
+          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            btcAmount.toNumber(),
+            "BUY" /* BUY */
+          ) : await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            35e-6,
+            // just in case amount falls short then we need to create a withdrawal
+            "BUY" /* BUY */
+          );
+          if (!openLongPosition) {
+            logger.error(`error opening long position: ${openLongPosition}`);
+            return {
+              calls: [],
+              status: false
+            };
+          }
+          await new Promise((resolve) => setTimeout(resolve, 5e3));
         }
-        await new Promise((resolve) => setTimeout(resolve, 5e3));
         const withdrawalFromExtended = await extendedAdapter.withdrawFromExtended(params.amount);
         if (withdrawalFromExtended) {
           const extendedHoldings2 = await extendedAdapter.getExtendedDepositAmount();
@@ -34255,6 +34251,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedPositionValue = position.length > 0 ? parseFloat(position[0].value) : 0;
+      const BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE = BUFFER_USDC_IN_WITHDRAWAL;
       const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
       if (!extendedHoldings) {
         logger.error(`error getting extended holdings: ${extendedHoldings}`);
@@ -34264,7 +34261,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForWithdrawal,
+        extendedHoldings.availableForTrade,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -34273,7 +34270,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const { collateralPrice } = await this.getAssetPrices();
       const { vesuAmountInBTC, extendedAmountInBTC } = calculateVesUPositionSizeGivenExtended(
         extendedPositionValue,
-        extendedHoldingAmount,
+        extendedHoldingAmount.minus(BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE),
         collateralTokenAmount,
         collateralPrice.price
       );
@@ -34290,7 +34287,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         const { amount: wbtcAmountInVaultAllocator } = await this.getUnusedBalanceWBTC();
         if (wbtcAmountInVaultAllocator.lessThan(vesuAmountInBTC)) {
-          logger.info(`WBTC amount in vault allocator is less than vesu amount required in WBTC thus swapping, wbtcAmountInVaultAllocator: ${wbtcAmountInVaultAllocator}, vesuAmountInBTC: ${vesuAmountInBTC}`);
           const swapProofsInfo = avnuAdapter.getProofs(true, this.getMerkleTree());
           const swapProofGroups = swapProofsInfo.proofs;
           const swapCall = this.getManageCall(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.2",
+  "version": "2.0.0-dev.4",
   "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/modules/ekubo-quoter.ts

@@ -70,21 +70,14 @@ export class EkuboQuoter {
   async getDexPrice(baseToken: TokenInfo, quoteToken: TokenInfo, amount: Web3Number) {
     const lstTokenInfo = baseToken;
     const lstUnderlyingTokenInfo = quoteToken;
-    console.log("lstTokenInfo", lstTokenInfo);
-    console.log("lstUnderlyingTokenInfo", lstUnderlyingTokenInfo);
-    console.log("amount", amount);
     const quote = await this.getQuote(
       lstTokenInfo.address.address,
       lstUnderlyingTokenInfo.address.address,
       amount
     );
-    console.log("quote", quote);
     // in Underlying
     const outputAmount = Web3Number.fromWei(quote.total_calculated, lstUnderlyingTokenInfo.decimals);
-    console.log("outputAmount", outputAmount);
-    console.log("amount", amount);
     const price = outputAmount.toNumber() / amount.toNumber();
-    console.log("price", price);
     logger.verbose(`${EkuboQuoter.name}:: LST Dex Price: ${price}`);
     return price;
   }
@@ -105,7 +98,6 @@ export class EkuboQuoter {
   // debt collateral 
   async getSwapLimitAmount(fromToken: TokenInfo, toToken: TokenInfo, amount: Web3Number, max_slippage: number = 0.002): Promise<Web3Number> {
     const isExactAmountIn = amount.greaterThanOrEqualTo(0);
-    console.log("isExactAmountIn", isExactAmountIn);
     logger.verbose(`${EkuboQuoter.name}::getSwapLimitAmount isExactAmountIn: ${isExactAmountIn}, fromToken: ${fromToken.symbol}, toToken: ${toToken.symbol}, amount: ${amount}`);
     const isYieldToken = this.tokenMarketData.isAPYSupported(toToken);
     console.log("isYieldToken", isYieldToken);
@@ -114,13 +106,10 @@ export class EkuboQuoter {
     // wbtc
     const baseToken = isExactAmountIn ? toToken : fromToken; // fromToken -> wbtc, 
     const quoteToken = isExactAmountIn ? fromToken : toToken; // toToken -> usdc, 
-    console.log("baseToken", baseToken);
-    console.log("quoteToken", quoteToken);
     // need dex price of from token in toToken
     // from baseToken to underlying token
     // for withdraw, usdc to btc with amount negative
     const dexPrice = await this.getDexPrice(baseToken, quoteToken, amount);
-    console.log("dexPrice", dexPrice);
     const trueExchangeRate = isYieldToken ? await this.tokenMarketData.getTruePrice(baseToken) : dexPrice;
     console.log("trueExchangeRate", trueExchangeRate);
     if (isExactAmountIn) {
@@ -155,7 +144,6 @@ export class EkuboQuoter {
       
       const isNegativeAmount = BigInt(split.amount_specified) <= 0n;
       const token = isNegativeAmount ? toTokenInfo : fromTokenInfo;
-      console.log("token for withdrawal", token, isNegativeAmount);
       return {
         route: split.route.map(_route => ({
           pool_key: {

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

@@ -156,8 +156,8 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
 
   async getDepositCall(params: DepositParams): Promise<ManageCall[]> {
     try {
-      const fromToken = this.config.supportedPositions[0].asset;
-      const toToken = this.config.supportedPositions[1].asset;
+      const fromToken = this.config.supportedPositions[0].asset; //usdc
+      const toToken = this.config.supportedPositions[1].asset; //wbtc
       const vaultAllocator = ContractAddr.from(
         this.config.vaultAllocator.address
       );
@@ -169,15 +169,18 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         toToken.decimals,
         true
       )
+      //console.log(`${AvnuAdapter.name}::getDepositCall quote: ${JSON.stringify(quote)}`);
       if (!quote) {
         logger.error("error getting quote from avnu");
         return [];
       }
+
       const getCalldata = await this.avnuWrapper.getSwapCallData(
         quote,
         vaultAllocator.address
       );
       const swapCallData = getCalldata[0];
+      
       // const approveCallData = getCalldata[0];
       const amount = uint256.bnToUint256(quote.sellAmountInUsd*10**7)
       return [
@@ -300,7 +303,7 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
     toTokenDecimals: number,
     usdcToBtc: boolean,
     maxIterations: number = 5,
-    tolerance: number = 10000
+    tolerance: number = 1000
   ): Promise<Quote | null>{
     try {
       const fromToken = this.config.supportedPositions[0].asset;

package/src/strategies/vesu-extended-strategy/utils/helper.ts

@@ -131,9 +131,6 @@ export const calculateAmountDistributionForWithdrawal = async (
     extendedPosition.length > 0
     ? new Web3Number(extendedPosition[0].value, USDC_TOKEN_DECIMALS)
     : new Web3Number(0, USDC_TOKEN_DECIMALS);
-    console.log("THe collateral is", collateralPrice, collateralUnits);
-    // console.log("the extended exposure usd is", extendedExposureUSD.toNumber());
-    //console.log("the collateral units are", collateralUnits.toNumber());\
     const vesuExposureUSD = collateralUnits.multipliedBy(collateralPrice);
     if (vesuExposureUSD.lessThan(0)) {
       return {
@@ -223,16 +220,16 @@ export const calculateDebtAmount = (
   collateralAmount: Web3Number,
   debtAmount: Web3Number,
   debtPrice: number,
-  maxLtv: number = MAX_LTV_BTC_USDC,
+  maxLtv: number = MAX_LIQUIDATION_RATIO,
   addedAmount: Web3Number, // this is in btc
   collateralPrice: number,
   isDeposit: boolean
 ) => {
   try {
     // => X = (((collateral + legDepositAmount) * collateralPrice * ltv) - (debt * debtPrice * target hf)) / (target hf - ltv)
-    const marginAmount = addedAmount.multipliedBy(isDeposit ? 1 : -1);
-    const numerator1 = collateralAmount
-      .plus(addedAmount)
+    const addedCollateral = addedAmount.multipliedBy(isDeposit ? 1 : -1);
+    const numerator1 = (collateralAmount
+      .plus(addedCollateral))
       .multipliedBy(collateralPrice)
       .multipliedBy(maxLtv);
     const numerator2 = debtAmount
@@ -308,17 +305,16 @@ export const calculateAmountDepositOnExtendedWhenIncurringLosses = async (
     const extendedHoldings = await client.getHoldings();
     const extended_leverage = calculateExtendedLevergae();
     const latestPosition = (await client.getPositions()).data.pop();
-    console.log("the latest position is", latestPosition, extendedHoldings);
     if (!extendedHoldings || !latestPosition) {
       logger.error(`error getting extended position: extendedHoldings=${extendedHoldings}, latestPosition=${latestPosition}`);
       return null;
     }
-    const positionValueInUSD = latestPosition.value;
+    const positionValueInUSD = new Web3Number(latestPosition.value, USDC_TOKEN_DECIMALS);
     const equity = extendedHoldings.data.equity;
-    const deposit =
-      Number(positionValueInUSD) / extended_leverage - Number(equity);
-    return new Web3Number(Math.floor(deposit / 0.2) * 0.2, USDC_TOKEN_DECIMALS);
+    const deposit = positionValueInUSD.dividedBy(extended_leverage).minus(equity).toFixed(2);
+    return new Web3Number(deposit, USDC_TOKEN_DECIMALS);
   } catch (err) {
+    logger.error(`error calculating amount deposit on extended when incurring losses: ${err}`);
     return null;
   }
 };

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

@@ -337,7 +337,7 @@ export class VesuExtendedMultiplierStrategy<
       }
       if (extendedAmount.lessThan(0)) {
         try {
-          const {calls: extendedCalls, status: extendedStatus} = await this.moveAssets(
+          const { calls: extendedCalls, status: extendedStatus } = await this.moveAssets(
             {
               to: Protocols.VAULT.name,
               from: Protocols.EXTENDED.name,
@@ -347,9 +347,9 @@ export class VesuExtendedMultiplierStrategy<
             vesuAdapter
           );
           //If withdrawal succesfull, then do further
-          if(extendedStatus){
-          calls.push(...extendedCalls);
-          }else{
+          if (extendedStatus) {
+            calls.push(...extendedCalls);
+          } else {
             return [];
           }
         } catch (err) {
@@ -359,7 +359,7 @@ export class VesuExtendedMultiplierStrategy<
 
       if (vesuAmount.lessThan(0)) {
         try {
-          const {calls: vesuCalls, status: vesuStatus} = await this.moveAssets(
+          const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VESU.name,
@@ -369,7 +369,7 @@ export class VesuExtendedMultiplierStrategy<
             vesuAdapter
           );
           calls.push(...vesuCalls);
-          if(!vesuStatus){
+          if (!vesuStatus) {
             return [];
           }
         } catch (err) {
@@ -384,16 +384,16 @@ export class VesuExtendedMultiplierStrategy<
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
       const usdcAmountOnExtended = parseFloat(
-        extendedHoldings.availableForWithdrawal
+        extendedHoldings.availableForTrade
       );
-      if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
+      if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
         //move assets to extended
         try {
-          const {calls: extendedCalls} = await this.moveAssets(
+          const { calls: extendedCalls } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VAULT.name,
-              amount: extendedAmount.minus(usdcAmountOnExtended),
+              amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended),
             },
             extendedAdapter,
             vesuAdapter
@@ -406,7 +406,7 @@ export class VesuExtendedMultiplierStrategy<
       if (vesuAmount.minus(usdcAmountInWallet).greaterThan(0)) {
         //move assets to vesu
         try {
-          const {calls: vesuCalls, status: vesuStatus} = await this.moveAssets(
+          const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
             {
               to: Protocols.VAULT.name,
               from: Protocols.EXTENDED.name,
@@ -415,7 +415,7 @@ export class VesuExtendedMultiplierStrategy<
             extendedAdapter,
             vesuAdapter
           );
-          if(!vesuStatus){
+          if (!vesuStatus) {
             return [];
           }
           calls.push(...vesuCalls);
@@ -487,22 +487,29 @@ export class VesuExtendedMultiplierStrategy<
           extendedHoldings.availableForWithdrawal,
           USDC_TOKEN_DECIMALS
         );
-      
-        const leftAmountAfterWithdrawalAmountInAccount = params.amount.minus(extendedHoldingAmount);
-        const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
-        const openLongPosition = await extendedAdapter.createOrder(
-          extendedLeverage.toString(),
-          btcAmount.toNumber(),
-          OrderSide.BUY
-        )
-        if (!openLongPosition) {
-          logger.error(`error opening long position: ${openLongPosition}`);
-          return {
-            calls: [],
-            status: false
-          };
+        logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
+        if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
+          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            btcAmount.toNumber(),
+            OrderSide.BUY
+          ) : await extendedAdapter.createOrder(
+            extendedLeverage.toString(),
+            0.000035, // just in case amount falls short then we need to create a withdrawal
+            OrderSide.BUY
+          )
+          if (!openLongPosition) {
+            logger.error(`error opening long position: ${openLongPosition}`);
+            return {
+              calls: [],
+              status: false
+            };
+          }
+          await new Promise(resolve => setTimeout(resolve, 5000));
         }
-        await new Promise(resolve => setTimeout(resolve, 5000));
         const withdrawalFromExtended =
           await extendedAdapter.withdrawFromExtended(params.amount);
         if (withdrawalFromExtended) {
@@ -642,6 +649,7 @@ export class VesuExtendedMultiplierStrategy<
         };
       }
       const extendedPositionValue = position.length > 0 ? parseFloat(position[0].value) : 0;
+      const BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE = BUFFER_USDC_IN_WITHDRAWAL;
       const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
       if (!extendedHoldings) {
         logger.error(`error getting extended holdings: ${extendedHoldings}`);
@@ -651,7 +659,7 @@ export class VesuExtendedMultiplierStrategy<
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForWithdrawal,
+        extendedHoldings.availableForTrade,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -660,12 +668,12 @@ export class VesuExtendedMultiplierStrategy<
       const { collateralPrice } = await this.getAssetPrices();
       const { vesuAmountInBTC, extendedAmountInBTC } = calculateVesUPositionSizeGivenExtended(
         extendedPositionValue,
-        extendedHoldingAmount,
+        extendedHoldingAmount.minus(BUFFER_AMOUNT_IN_AVAILABLE_FOR_TRADE),
         collateralTokenAmount,
         collateralPrice.price
       );
-     logger.info(`vesuAmountInBTC ${vesuAmountInBTC}, extendedAmountInBTC ${extendedAmountInBTC}`);
-     
+      logger.info(`vesuAmountInBTC ${vesuAmountInBTC}, extendedAmountInBTC ${extendedAmountInBTC}`);
+
       let calls: Call[] = [];
       if (vesuAmountInBTC.greaterThan(MINIMUM_EXTENDED_POSITION_SIZE)) {
         const proofsInfo = vesuAdapter.getProofs(true, this.getMerkleTree());
@@ -678,7 +686,6 @@ export class VesuExtendedMultiplierStrategy<
         );
         const { amount: wbtcAmountInVaultAllocator } = await this.getUnusedBalanceWBTC();
         if (wbtcAmountInVaultAllocator.lessThan(vesuAmountInBTC)) {
-          logger.info(`WBTC amount in vault allocator is less than vesu amount required in WBTC thus swapping, wbtcAmountInVaultAllocator: ${wbtcAmountInVaultAllocator}, vesuAmountInBTC: ${vesuAmountInBTC}`);
           const swapProofsInfo = avnuAdapter.getProofs(true, this.getMerkleTree());
           const swapProofGroups = swapProofsInfo.proofs;
           const swapCall = this.getManageCall(
@@ -691,7 +698,6 @@ export class VesuExtendedMultiplierStrategy<
         }
         calls.push(call);
       }
-
       const shortPosition = extendedAmountInBTC.multipliedBy(3).abs().greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
         extendedLeverage.toString(),
         extendedAmountInBTC.toNumber(),
@@ -736,7 +742,7 @@ export class VesuExtendedMultiplierStrategy<
     return false;
   }
 
-  async handleWithdraw(amount: Web3Number): Promise<{calls: Call[], status: boolean}> {
+  async handleWithdraw(amount: Web3Number): Promise<{ calls: Call[], status: boolean }> {
     try {
       const usdcBalanceVaultAllocator = await this.getUnusedBalance()
       const usdcBalanceDifference = amount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcBalanceVaultAllocator.usdValue);
@@ -750,8 +756,8 @@ export class VesuExtendedMultiplierStrategy<
         logger.info("withdraw call", withdrawCall);
         calls.push(withdrawCall);
         return {
-          calls:calls,
-          status:true
+          calls: calls,
+          status: true
         };
       }
       const vesuAdapter = await this.getVesuAdapter();
@@ -762,8 +768,8 @@ export class VesuExtendedMultiplierStrategy<
           `vesu or extended adapter not found: vesuAdapter=${vesuAdapter}, extendedAdapter=${extendedAdapter}`
         );
         return {
-          calls:calls,
-          status:status
+          calls: calls,
+          status: status
         };
       }
       const { collateralTokenAmount } =
@@ -772,12 +778,12 @@ export class VesuExtendedMultiplierStrategy<
         collateralPrice
       } = await this.getAssetPrices();
       const extendedPositon = await extendedAdapter.getAllOpenPositions();
-      if(!extendedPositon) {
+      if (!extendedPositon) {
         status = false;
         logger.error("error getting extended position", extendedPositon);
         return {
-          calls:calls,
-          status:status
+          calls: calls,
+          status: status
         }
       }
       const amountDistributionForWithdrawal =
@@ -793,14 +799,14 @@ export class VesuExtendedMultiplierStrategy<
           `error calculating amount distribution for withdrawal: ${amountDistributionForWithdrawal}`
         );
         return {
-          calls:calls,
-          status:status
+          calls: calls,
+          status: status
         };
       }
       const { vesu_amount, extended_amount } = amountDistributionForWithdrawal;
-    
+
       if (status && vesu_amount.greaterThan(0)) {
-        const {calls: vesuCalls, status: vesuStatus} = await this.moveAssets(
+        const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
           {
             amount: vesu_amount,
             from: Protocols.VESU.name,
@@ -813,7 +819,7 @@ export class VesuExtendedMultiplierStrategy<
         calls.push(...vesuCalls);
       }
       if (status && extended_amount.greaterThan(0)) {
-        const {calls: extendedCalls, status: extendedStatus} = await this.moveAssets(
+        const { calls: extendedCalls, status: extendedStatus } = await this.moveAssets(
           {
             amount: extended_amount,
             from: Protocols.EXTENDED.name,
@@ -823,9 +829,9 @@ export class VesuExtendedMultiplierStrategy<
           vesuAdapter
         );
         status = extendedStatus;
-        if(status) {
+        if (status) {
           calls.push(...extendedCalls);
-        }else{
+        } else {
           logger.error("error moving assets to vault: extendedStatus: ${extendedStatus}");
           return {
             calls: [],