@strkfarm/sdk 2.0.0-dev.20 → 2.0.0-dev.22

package/dist/index.browser.global.js

@@ -94873,6 +94873,8 @@ spurious results.`);
           return null;
         }
         const dataObject = finalQuote.data[0];
+        const wbtcAmountOut = parseInt(dataObject.buyAmount.toString(), 16);
+        logger2.info(`${_AvnuAdapter.name}::getQuotesAvnu finalAmountOfWbtcOut : ${wbtcAmountOut} ${dataObject.buyAmount} ${dataObject.sellAmount.toString()} ${dataObject.sellAmount.toString()}`);
         return dataObject;
       } catch (err2) {
         logger2.error(`No quotes available for this swap: ${err2}`);
@@ -98551,7 +98553,7 @@ spurious results.`);
             };
           }
         }
-        const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).multipliedBy(1 - LIMIT_BALANCE);
+        const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForTrade ?? 0).multipliedBy(1 - LIMIT_BALANCE);
         const amountToInvestNumber = amountToInvest.toNumber();
         if (!Number.isFinite(amountToInvestNumber)) {
           logger2.error(
@@ -98687,17 +98689,17 @@ spurious results.`);
           return [];
         }
         const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
-        const usdcAmountOnExtendedAvailableForWithdrawal = parseFloat(
-          extendedHoldings.availableForWithdrawal
+        const usdcAmountOnExtendedAvailableForTrade = parseFloat(
+          extendedHoldings.availableForTrade
         );
-        logger2.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForWithdrawal}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
+        logger2.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForTrade}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
         let totalExtendedWithdrawal = new Web3Number(0, USDC_TOKEN_DECIMALS);
         let totalExtendedDeposit = new Web3Number(0, USDC_TOKEN_DECIMALS);
         if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
           totalExtendedWithdrawal = totalExtendedWithdrawal.plus(extendedAmount.abs());
         }
         const extendedTargetAmount = extendedAmount.abs();
-        let projectedExtendedBalance = usdcAmountOnExtendedAvailableForWithdrawal;
+        let projectedExtendedBalance = usdcAmountOnExtendedAvailableForTrade;
         if (extendedAmount.isNegative()) {
           projectedExtendedBalance = projectedExtendedBalance - extendedAmount.abs().toNumber();
         }
@@ -98713,7 +98715,6 @@ spurious results.`);
         let vesuAmountDifference = vesuTargetAmount.minus(projectedWalletBalance);
         const vesuAmountDifferenceAbs = vesuAmountDifference.abs();
         logger2.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculated movements - Extended withdrawal: ${totalExtendedWithdrawal.toNumber()}, Extended deposit: ${totalExtendedDeposit.toNumber()}, Extended diff: ${extendedAmountDifference.toNumber()}, Projected wallet: ${projectedWalletBalance.toNumber()}, Vesu diff: ${vesuAmountDifference.toNumber()}`);
-        let calls = [];
         let transactionResults = [];
         if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
           try {
@@ -98891,6 +98892,15 @@ spurious results.`);
       }
       return { calls: [], status: false, transactionMetadata: { protocolFrom: "", protocolTo: "", transactionType: "DEPOSIT", usdAmount: "0", status: "FAILED", cycleType } };
     }
+    /**
+     * This method is used to move assets between protocols
+     * @param params - The parameters for the move assets operation
+     * @param extendedAdapter - The extended adapter
+     * @param vesuAdapter - The vesu adapter
+     * @returns The transaction result
+     * If Extended amount is greater than amount of withdrawal from extended, then we need to open a long position 
+     * so that the amount of withdrawal from extended is fullfilled
+     */
     async moveAssets(params, extendedAdapter, vesuAdapter) {
       try {
         if (params.amount.lessThanOrEqualTo(0)) {
@@ -98899,23 +98909,6 @@ spurious results.`);
           );
           return this.createTransactionResult([], false, params, "NONE", params.cycleType);
         }
-        const amountAbs = params.amount.abs();
-        if (params.from === Protocols.EXTENDED.name || params.to === Protocols.EXTENDED.name) {
-          if (amountAbs.lessThanOrEqualTo(extendedAdapter.minimumExtendedMovementAmount)) {
-            logger2.warn(
-              `Amount ${amountAbs.toNumber()} is below minimum Extended movement amount ${extendedAdapter.minimumExtendedMovementAmount}. Skipping operation.`
-            );
-            return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-          }
-        }
-        if (params.from === Protocols.VESU.name || params.to === Protocols.VESU.name) {
-          if (amountAbs.lessThanOrEqualTo(vesuAdapter.minimumVesuMovementAmount)) {
-            logger2.warn(
-              `Amount ${amountAbs.toNumber()} is below minimum Vesu movement amount ${vesuAdapter.minimumVesuMovementAmount}. Skipping operation.`
-            );
-            return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-          }
-        }
         const avnuAdapter = await this.getAvnuAdapter();
         if (!avnuAdapter) {
           logger2.error(`avnu adapter not found: ${avnuAdapter}`);
@@ -98952,9 +98945,22 @@ spurious results.`);
           );
           logger2.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
           if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
-            const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+            const leftAmountAfterWithdrawalAmountInAccount = new Web3Number(Math.ceil(params.amount.abs().minus(extendedHoldingAmount).toNumber()), USDC_TOKEN_DECIMALS);
             logger2.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
-            const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+            let priceOfBTC;
+            const {
+              ask,
+              bid,
+              status
+            } = await extendedAdapter.fetchOrderBookBTCUSDC();
+            const price = ask.plus(bid).dividedBy(2);
+            if (status) {
+              priceOfBTC = price;
+            } else {
+              logger2.error(`error fetching order book btc usdc: ${status}`);
+              priceOfBTC = collateralPrice.price;
+            }
+            const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(priceOfBTC);
             const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
               extendedLeverage.toString(),
               btcAmount.toNumber(),

package/dist/index.browser.mjs

@@ -30834,6 +30834,8 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
         return null;
       }
       const dataObject = finalQuote.data[0];
+      const wbtcAmountOut = parseInt(dataObject.buyAmount.toString(), 16);
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu finalAmountOfWbtcOut : ${wbtcAmountOut} ${dataObject.buyAmount} ${dataObject.sellAmount.toString()} ${dataObject.sellAmount.toString()}`);
       return dataObject;
     } catch (err) {
       logger.error(`No quotes available for this swap: ${err}`);
@@ -34515,7 +34517,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           };
         }
       }
-      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).multipliedBy(1 - LIMIT_BALANCE);
+      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForTrade ?? 0).multipliedBy(1 - LIMIT_BALANCE);
       const amountToInvestNumber = amountToInvest.toNumber();
       if (!Number.isFinite(amountToInvestNumber)) {
         logger.error(
@@ -34651,17 +34653,17 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         return [];
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
-      const usdcAmountOnExtendedAvailableForWithdrawal = parseFloat(
-        extendedHoldings.availableForWithdrawal
+      const usdcAmountOnExtendedAvailableForTrade = parseFloat(
+        extendedHoldings.availableForTrade
       );
-      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForWithdrawal}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForTrade}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
       let totalExtendedWithdrawal = new Web3Number(0, USDC_TOKEN_DECIMALS);
       let totalExtendedDeposit = new Web3Number(0, USDC_TOKEN_DECIMALS);
       if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         totalExtendedWithdrawal = totalExtendedWithdrawal.plus(extendedAmount.abs());
       }
       const extendedTargetAmount = extendedAmount.abs();
-      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForWithdrawal;
+      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForTrade;
       if (extendedAmount.isNegative()) {
         projectedExtendedBalance = projectedExtendedBalance - extendedAmount.abs().toNumber();
       }
@@ -34677,7 +34679,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       let vesuAmountDifference = vesuTargetAmount.minus(projectedWalletBalance);
       const vesuAmountDifferenceAbs = vesuAmountDifference.abs();
       logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculated movements - Extended withdrawal: ${totalExtendedWithdrawal.toNumber()}, Extended deposit: ${totalExtendedDeposit.toNumber()}, Extended diff: ${extendedAmountDifference.toNumber()}, Projected wallet: ${projectedWalletBalance.toNumber()}, Vesu diff: ${vesuAmountDifference.toNumber()}`);
-      let calls = [];
       let transactionResults = [];
       if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         try {
@@ -34855,6 +34856,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
     }
     return { calls: [], status: false, transactionMetadata: { protocolFrom: "", protocolTo: "", transactionType: "DEPOSIT", usdAmount: "0", status: "FAILED", cycleType } };
   }
+  /**
+   * This method is used to move assets between protocols
+   * @param params - The parameters for the move assets operation
+   * @param extendedAdapter - The extended adapter
+   * @param vesuAdapter - The vesu adapter
+   * @returns The transaction result
+   * If Extended amount is greater than amount of withdrawal from extended, then we need to open a long position 
+   * so that the amount of withdrawal from extended is fullfilled
+   */
   async moveAssets(params, extendedAdapter, vesuAdapter) {
     try {
       if (params.amount.lessThanOrEqualTo(0)) {
@@ -34863,23 +34873,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         return this.createTransactionResult([], false, params, "NONE", params.cycleType);
       }
-      const amountAbs = params.amount.abs();
-      if (params.from === Protocols.EXTENDED.name || params.to === Protocols.EXTENDED.name) {
-        if (amountAbs.lessThanOrEqualTo(extendedAdapter.minimumExtendedMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Extended movement amount ${extendedAdapter.minimumExtendedMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
-      if (params.from === Protocols.VESU.name || params.to === Protocols.VESU.name) {
-        if (amountAbs.lessThanOrEqualTo(vesuAdapter.minimumVesuMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Vesu movement amount ${vesuAdapter.minimumVesuMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
       const avnuAdapter = await this.getAvnuAdapter();
       if (!avnuAdapter) {
         logger.error(`avnu adapter not found: ${avnuAdapter}`);
@@ -34916,9 +34909,22 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
         if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
-          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          const leftAmountAfterWithdrawalAmountInAccount = new Web3Number(Math.ceil(params.amount.abs().minus(extendedHoldingAmount).toNumber()), USDC_TOKEN_DECIMALS);
           logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
-          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          let priceOfBTC;
+          const {
+            ask,
+            bid,
+            status
+          } = await extendedAdapter.fetchOrderBookBTCUSDC();
+          const price = ask.plus(bid).dividedBy(2);
+          if (status) {
+            priceOfBTC = price;
+          } else {
+            logger.error(`error fetching order book btc usdc: ${status}`);
+            priceOfBTC = collateralPrice.price;
+          }
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(priceOfBTC);
           const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
             extendedLeverage.toString(),
             btcAmount.toNumber(),

package/dist/index.d.ts

@@ -2287,6 +2287,15 @@ declare class VesuExtendedMultiplierStrategy<S extends VesuExtendedStrategySetti
      * Helper method to create transaction result with metadata
      */
     private createTransactionResult;
+    /**
+     * This method is used to move assets between protocols
+     * @param params - The parameters for the move assets operation
+     * @param extendedAdapter - The extended adapter
+     * @param vesuAdapter - The vesu adapter
+     * @returns The transaction result
+     * If Extended amount is greater than amount of withdrawal from extended, then we need to open a long position
+     * so that the amount of withdrawal from extended is fullfilled
+     */
     moveAssets(params: {
         amount: Web3Number;
         from: string;

package/dist/index.js

@@ -30991,6 +30991,8 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
         return null;
       }
       const dataObject = finalQuote.data[0];
+      const wbtcAmountOut = parseInt(dataObject.buyAmount.toString(), 16);
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu finalAmountOfWbtcOut : ${wbtcAmountOut} ${dataObject.buyAmount} ${dataObject.sellAmount.toString()} ${dataObject.sellAmount.toString()}`);
       return dataObject;
     } catch (err) {
       logger.error(`No quotes available for this swap: ${err}`);
@@ -34672,7 +34674,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           };
         }
       }
-      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).multipliedBy(1 - LIMIT_BALANCE);
+      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForTrade ?? 0).multipliedBy(1 - LIMIT_BALANCE);
       const amountToInvestNumber = amountToInvest.toNumber();
       if (!Number.isFinite(amountToInvestNumber)) {
         logger.error(
@@ -34808,17 +34810,17 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         return [];
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
-      const usdcAmountOnExtendedAvailableForWithdrawal = parseFloat(
-        extendedHoldings.availableForWithdrawal
+      const usdcAmountOnExtendedAvailableForTrade = parseFloat(
+        extendedHoldings.availableForTrade
       );
-      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForWithdrawal}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForTrade}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
       let totalExtendedWithdrawal = new Web3Number(0, USDC_TOKEN_DECIMALS);
       let totalExtendedDeposit = new Web3Number(0, USDC_TOKEN_DECIMALS);
       if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         totalExtendedWithdrawal = totalExtendedWithdrawal.plus(extendedAmount.abs());
       }
       const extendedTargetAmount = extendedAmount.abs();
-      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForWithdrawal;
+      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForTrade;
       if (extendedAmount.isNegative()) {
         projectedExtendedBalance = projectedExtendedBalance - extendedAmount.abs().toNumber();
       }
@@ -34834,7 +34836,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       let vesuAmountDifference = vesuTargetAmount.minus(projectedWalletBalance);
       const vesuAmountDifferenceAbs = vesuAmountDifference.abs();
       logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculated movements - Extended withdrawal: ${totalExtendedWithdrawal.toNumber()}, Extended deposit: ${totalExtendedDeposit.toNumber()}, Extended diff: ${extendedAmountDifference.toNumber()}, Projected wallet: ${projectedWalletBalance.toNumber()}, Vesu diff: ${vesuAmountDifference.toNumber()}`);
-      let calls = [];
       let transactionResults = [];
       if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         try {
@@ -35012,6 +35013,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
     }
     return { calls: [], status: false, transactionMetadata: { protocolFrom: "", protocolTo: "", transactionType: "DEPOSIT", usdAmount: "0", status: "FAILED", cycleType } };
   }
+  /**
+   * This method is used to move assets between protocols
+   * @param params - The parameters for the move assets operation
+   * @param extendedAdapter - The extended adapter
+   * @param vesuAdapter - The vesu adapter
+   * @returns The transaction result
+   * If Extended amount is greater than amount of withdrawal from extended, then we need to open a long position 
+   * so that the amount of withdrawal from extended is fullfilled
+   */
   async moveAssets(params, extendedAdapter, vesuAdapter) {
     try {
       if (params.amount.lessThanOrEqualTo(0)) {
@@ -35020,23 +35030,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         return this.createTransactionResult([], false, params, "NONE", params.cycleType);
       }
-      const amountAbs = params.amount.abs();
-      if (params.from === Protocols.EXTENDED.name || params.to === Protocols.EXTENDED.name) {
-        if (amountAbs.lessThanOrEqualTo(extendedAdapter.minimumExtendedMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Extended movement amount ${extendedAdapter.minimumExtendedMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
-      if (params.from === Protocols.VESU.name || params.to === Protocols.VESU.name) {
-        if (amountAbs.lessThanOrEqualTo(vesuAdapter.minimumVesuMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Vesu movement amount ${vesuAdapter.minimumVesuMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
       const avnuAdapter = await this.getAvnuAdapter();
       if (!avnuAdapter) {
         logger.error(`avnu adapter not found: ${avnuAdapter}`);
@@ -35073,9 +35066,22 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
         if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
-          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          const leftAmountAfterWithdrawalAmountInAccount = new Web3Number(Math.ceil(params.amount.abs().minus(extendedHoldingAmount).toNumber()), USDC_TOKEN_DECIMALS);
           logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
-          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          let priceOfBTC;
+          const {
+            ask,
+            bid,
+            status
+          } = await extendedAdapter.fetchOrderBookBTCUSDC();
+          const price = ask.plus(bid).dividedBy(2);
+          if (status) {
+            priceOfBTC = price;
+          } else {
+            logger.error(`error fetching order book btc usdc: ${status}`);
+            priceOfBTC = collateralPrice.price;
+          }
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(priceOfBTC);
           const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
             extendedLeverage.toString(),
             btcAmount.toNumber(),

package/dist/index.mjs

@@ -30845,6 +30845,8 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
         return null;
       }
       const dataObject = finalQuote.data[0];
+      const wbtcAmountOut = parseInt(dataObject.buyAmount.toString(), 16);
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu finalAmountOfWbtcOut : ${wbtcAmountOut} ${dataObject.buyAmount} ${dataObject.sellAmount.toString()} ${dataObject.sellAmount.toString()}`);
       return dataObject;
     } catch (err) {
       logger.error(`No quotes available for this swap: ${err}`);
@@ -34526,7 +34528,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           };
         }
       }
-      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).multipliedBy(1 - LIMIT_BALANCE);
+      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForTrade ?? 0).multipliedBy(1 - LIMIT_BALANCE);
       const amountToInvestNumber = amountToInvest.toNumber();
       if (!Number.isFinite(amountToInvestNumber)) {
         logger.error(
@@ -34662,17 +34664,17 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         return [];
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
-      const usdcAmountOnExtendedAvailableForWithdrawal = parseFloat(
-        extendedHoldings.availableForWithdrawal
+      const usdcAmountOnExtendedAvailableForTrade = parseFloat(
+        extendedHoldings.availableForTrade
       );
-      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForWithdrawal}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForTrade}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
       let totalExtendedWithdrawal = new Web3Number(0, USDC_TOKEN_DECIMALS);
       let totalExtendedDeposit = new Web3Number(0, USDC_TOKEN_DECIMALS);
       if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         totalExtendedWithdrawal = totalExtendedWithdrawal.plus(extendedAmount.abs());
       }
       const extendedTargetAmount = extendedAmount.abs();
-      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForWithdrawal;
+      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForTrade;
       if (extendedAmount.isNegative()) {
         projectedExtendedBalance = projectedExtendedBalance - extendedAmount.abs().toNumber();
       }
@@ -34688,7 +34690,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       let vesuAmountDifference = vesuTargetAmount.minus(projectedWalletBalance);
       const vesuAmountDifferenceAbs = vesuAmountDifference.abs();
       logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculated movements - Extended withdrawal: ${totalExtendedWithdrawal.toNumber()}, Extended deposit: ${totalExtendedDeposit.toNumber()}, Extended diff: ${extendedAmountDifference.toNumber()}, Projected wallet: ${projectedWalletBalance.toNumber()}, Vesu diff: ${vesuAmountDifference.toNumber()}`);
-      let calls = [];
       let transactionResults = [];
       if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         try {
@@ -34866,6 +34867,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
     }
     return { calls: [], status: false, transactionMetadata: { protocolFrom: "", protocolTo: "", transactionType: "DEPOSIT", usdAmount: "0", status: "FAILED", cycleType } };
   }
+  /**
+   * This method is used to move assets between protocols
+   * @param params - The parameters for the move assets operation
+   * @param extendedAdapter - The extended adapter
+   * @param vesuAdapter - The vesu adapter
+   * @returns The transaction result
+   * If Extended amount is greater than amount of withdrawal from extended, then we need to open a long position 
+   * so that the amount of withdrawal from extended is fullfilled
+   */
   async moveAssets(params, extendedAdapter, vesuAdapter) {
     try {
       if (params.amount.lessThanOrEqualTo(0)) {
@@ -34874,23 +34884,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         return this.createTransactionResult([], false, params, "NONE", params.cycleType);
       }
-      const amountAbs = params.amount.abs();
-      if (params.from === Protocols.EXTENDED.name || params.to === Protocols.EXTENDED.name) {
-        if (amountAbs.lessThanOrEqualTo(extendedAdapter.minimumExtendedMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Extended movement amount ${extendedAdapter.minimumExtendedMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
-      if (params.from === Protocols.VESU.name || params.to === Protocols.VESU.name) {
-        if (amountAbs.lessThanOrEqualTo(vesuAdapter.minimumVesuMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Vesu movement amount ${vesuAdapter.minimumVesuMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
       const avnuAdapter = await this.getAvnuAdapter();
       if (!avnuAdapter) {
         logger.error(`avnu adapter not found: ${avnuAdapter}`);
@@ -34927,9 +34920,22 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
         if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
-          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          const leftAmountAfterWithdrawalAmountInAccount = new Web3Number(Math.ceil(params.amount.abs().minus(extendedHoldingAmount).toNumber()), USDC_TOKEN_DECIMALS);
           logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
-          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          let priceOfBTC;
+          const {
+            ask,
+            bid,
+            status
+          } = await extendedAdapter.fetchOrderBookBTCUSDC();
+          const price = ask.plus(bid).dividedBy(2);
+          if (status) {
+            priceOfBTC = price;
+          } else {
+            logger.error(`error fetching order book btc usdc: ${status}`);
+            priceOfBTC = collateralPrice.price;
+          }
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(priceOfBTC);
           const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
             extendedLeverage.toString(),
             btcAmount.toNumber(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.20",
+  "version": "2.0.0-dev.22",
   "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/universal-adapters/avnu-adapter.ts

@@ -387,6 +387,8 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         return null;
       }
       const dataObject: Quote = finalQuote.data[0];
+      const wbtcAmountOut = parseInt(dataObject.buyAmount.toString(), 16);
+      logger.info(`${AvnuAdapter.name}::getQuotesAvnu finalAmountOfWbtcOut : ${wbtcAmountOut} ${dataObject.buyAmount} ${dataObject.sellAmount.toString()} ${dataObject.sellAmount.toString()}`);
       return dataObject;
     } catch (err) {
       logger.error(`No quotes available for this swap: ${err}`);

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

@@ -335,7 +335,7 @@ export class VesuExtendedMultiplierStrategy<
       }
 
       /** The LIMIT_BALANCE is the bffer amount to keep in the investing Cycle */
-      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).multipliedBy(1 - LIMIT_BALANCE);
+      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForTrade ?? 0).multipliedBy(1 - LIMIT_BALANCE);
 
 
       const amountToInvestNumber = amountToInvest.toNumber();
@@ -488,11 +488,14 @@ export class VesuExtendedMultiplierStrategy<
         return [];
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
-      const usdcAmountOnExtendedAvailableForWithdrawal = parseFloat(
-        extendedHoldings.availableForWithdrawal
+      /**
+       * Trade is the correct metric, since we can close position for some vesu amount, otherwise underutilisation of funds will be a huge issue
+       */
+      const usdcAmountOnExtendedAvailableForTrade = parseFloat(
+        extendedHoldings.availableForTrade
       );
 
-      logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForWithdrawal}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculating movements - Extended current: ${usdcAmountOnExtendedAvailableForTrade}, Wallet: ${usdcAmountInWallet.toNumber()}, Target Extended: ${extendedAmount.toNumber()}, Target Vesu: ${vesuAmount.toNumber()}`);
 
       let totalExtendedWithdrawal = new Web3Number(0, USDC_TOKEN_DECIMALS);
       let totalExtendedDeposit = new Web3Number(0, USDC_TOKEN_DECIMALS);
@@ -505,7 +508,7 @@ export class VesuExtendedMultiplierStrategy<
       // If extendedAmount was negative, we've already accounted for that withdrawal
       // So we calculate based on what Extended will be after that withdrawal
       const extendedTargetAmount = extendedAmount.abs(); // Use absolute value as target
-      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForWithdrawal;
+      let projectedExtendedBalance = usdcAmountOnExtendedAvailableForTrade;
 
       if (extendedAmount.isNegative()) {
         projectedExtendedBalance = projectedExtendedBalance - extendedAmount.abs().toNumber();
@@ -530,7 +533,6 @@ export class VesuExtendedMultiplierStrategy<
       const vesuAmountDifferenceAbs = vesuAmountDifference.abs();
 
       logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldMoveAssets calculated movements - Extended withdrawal: ${totalExtendedWithdrawal.toNumber()}, Extended deposit: ${totalExtendedDeposit.toNumber()}, Extended diff: ${extendedAmountDifference.toNumber()}, Projected wallet: ${projectedWalletBalance.toNumber()}, Vesu diff: ${vesuAmountDifference.toNumber()}`);
-      let calls: Call[] = [];
       let transactionResults: TransactionResult[] = [];
 
       // Handle negative extendedAmount (initial withdrawal needed)
@@ -690,7 +692,6 @@ export class VesuExtendedMultiplierStrategy<
           }
         }
       }
-
       return transactionResults;
     } catch (err) {
       logger.error(`Failed moving assets to vesu: ${err}`);
@@ -725,6 +726,15 @@ export class VesuExtendedMultiplierStrategy<
     return { calls: [], status: false, transactionMetadata: { protocolFrom: '', protocolTo: '', transactionType: 'DEPOSIT', usdAmount: '0', status: 'FAILED', cycleType: cycleType } };
   }
 
+  /**
+   * This method is used to move assets between protocols
+   * @param params - The parameters for the move assets operation
+   * @param extendedAdapter - The extended adapter
+   * @param vesuAdapter - The vesu adapter
+   * @returns The transaction result
+   * If Extended amount is greater than amount of withdrawal from extended, then we need to open a long position 
+   * so that the amount of withdrawal from extended is fullfilled
+   */
   async moveAssets(
     params: {
       amount: Web3Number;
@@ -745,23 +755,23 @@ export class VesuExtendedMultiplierStrategy<
       }
 
       // Check minimum movement amounts before starting operations
-      const amountAbs = params.amount.abs();
-      if (params.from === Protocols.EXTENDED.name || params.to === Protocols.EXTENDED.name) {
-        if (amountAbs.lessThanOrEqualTo(extendedAdapter.minimumExtendedMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Extended movement amount ${extendedAdapter.minimumExtendedMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
-      if (params.from === Protocols.VESU.name || params.to === Protocols.VESU.name) {
-        if (amountAbs.lessThanOrEqualTo(vesuAdapter.minimumVesuMovementAmount)) {
-          logger.warn(
-            `Amount ${amountAbs.toNumber()} is below minimum Vesu movement amount ${vesuAdapter.minimumVesuMovementAmount}. Skipping operation.`
-          );
-          return this.createTransactionResult([], false, params, "NONE", params.cycleType);
-        }
-      }
+      // const amountAbs = params.amount.abs();
+      // if (params.from === Protocols.EXTENDED.name || params.to === Protocols.EXTENDED.name) {
+      //   if (amountAbs.lessThanOrEqualTo(extendedAdapter.minimumExtendedMovementAmount)) {
+      //     logger.warn(
+      //       `Amount ${amountAbs.toNumber()} is below minimum Extended movement amount ${extendedAdapter.minimumExtendedMovementAmount}. Skipping operation.`
+      //     );
+      //     return this.createTransactionResult([], false, params, "NONE", params.cycleType);
+      //   }
+      // }
+      // if (params.from === Protocols.VESU.name || params.to === Protocols.VESU.name) {
+      //   if (amountAbs.lessThanOrEqualTo(vesuAdapter.minimumVesuMovementAmount)) {
+      //     logger.warn(
+      //       `Amount ${amountAbs.toNumber()} is below minimum Vesu movement amount ${vesuAdapter.minimumVesuMovementAmount}. Skipping operation.`
+      //     );
+      //     return this.createTransactionResult([], false, params, "NONE", params.cycleType);
+      //   }
+      // }
 
       const avnuAdapter = await this.getAvnuAdapter();
       if (!avnuAdapter) {
@@ -787,7 +797,8 @@ export class VesuExtendedMultiplierStrategy<
         );
         calls.push(call);
         return this.createTransactionResult(calls, true, params, "DEPOSIT", params.cycleType);
-      } else if (params.to === Protocols.VAULT.name && params.from === Protocols.EXTENDED.name) {
+      } 
+      else if (params.to === Protocols.VAULT.name && params.from === Protocols.EXTENDED.name) {
         const extendedLeverage = calculateExtendedLevergae();
         const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
         if (!extendedHoldings) {
@@ -800,9 +811,26 @@ export class VesuExtendedMultiplierStrategy<
         );
         logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssets extendedHoldingAmount: ${extendedHoldingAmount.toNumber()}`);
         if (params.amount.abs().greaterThan(extendedHoldingAmount)) {
-          const leftAmountAfterWithdrawalAmountInAccount = params.amount.abs().minus(extendedHoldingAmount);
+          const leftAmountAfterWithdrawalAmountInAccount = new Web3Number(Math.ceil(params.amount.abs().minus(extendedHoldingAmount).toNumber()), USDC_TOKEN_DECIMALS);
           logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssets leftAmountAfterWithdrawalAmountInAccount: ${leftAmountAfterWithdrawalAmountInAccount.toNumber()}`);
-          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.dividedBy(collateralPrice.price);
+          let priceOfBTC;
+          const {
+            ask,
+            bid,
+            status
+          } = await extendedAdapter.fetchOrderBookBTCUSDC();
+          const price = ask.plus(bid).dividedBy(2);
+          if (status) {
+            priceOfBTC = price;
+          } else {
+            logger.error(`error fetching order book btc usdc: ${status}`);
+            priceOfBTC = collateralPrice.price;
+          }
+          const btcAmount = leftAmountAfterWithdrawalAmountInAccount.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
+           */
           const openLongPosition = btcAmount.multipliedBy(3).greaterThan(MINIMUM_EXTENDED_POSITION_SIZE) ? await extendedAdapter.createOrder(
             extendedLeverage.toString(),
             btcAmount.toNumber(),
@@ -856,6 +884,7 @@ export class VesuExtendedMultiplierStrategy<
           return this.createTransactionResult([], false, params, "NONE", params.cycleType);
         }
       } else if (params.to === Protocols.VAULT.name && params.from === Protocols.VESU.name) {
+
         const isPriceDifferenceBetweenAvnuAndExtended = await this.checkPriceDifferenceBetweenAvnuAndExtended(extendedAdapter, vesuAdapter, avnuAdapter, PositionTypeAvnuExtended.CLOSE);
         if (!isPriceDifferenceBetweenAvnuAndExtended) {
           logger.warn(`price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`);
@@ -882,7 +911,10 @@ export class VesuExtendedMultiplierStrategy<
         );
         calls.push(swapCall);
         return this.createTransactionResult(calls, true, params, "WITHDRAWAL", params.cycleType);
-      } else if (params.to === Protocols.EXTENDED.name && params.from === Protocols.VESU.name) {
+
+      } 
+      else if (params.to === Protocols.EXTENDED.name && params.from === Protocols.VESU.name) {
+
         const isPriceDifferenceBetweenAvnuAndExtended = await this.checkPriceDifferenceBetweenAvnuAndExtended(extendedAdapter, vesuAdapter, avnuAdapter, PositionTypeAvnuExtended.CLOSE);
         if (!isPriceDifferenceBetweenAvnuAndExtended) {
           logger.warn(`price difference between avnu and extended doesn't fit the range for close position, ${avnuAdapter.config.maximumExtendedPriceDifferenceForSwapClosing}`);
@@ -922,6 +954,7 @@ export class VesuExtendedMultiplierStrategy<
       }
       logger.error(`Unsupported assets movement: ${params.from} to ${params.to}`);
       return this.createTransactionResult([], false, params, "NONE", params.cycleType);
+
     } catch (err) {
       logger.error(`error moving assets: ${err}`);
       return this.createTransactionResult([], false, params, "NONE", params.cycleType);