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

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

@@ -66,12 +66,10 @@ export const calculateAmountDistribution = async (
         vesu_leverage: 0,
       };
     }
-    const extendedBTCExposure =
+    const extendedExposureUSD =
       extendedPosition.length > 0
-        ? new Web3Number(extendedPosition[0].size, WBTC_TOKEN_DECIMALS)
+        ? new Web3Number(extendedPosition[0].value, WBTC_TOKEN_DECIMALS)
         : new Web3Number(0, WBTC_TOKEN_DECIMALS);
-    const extendedExposureUSD =
-      extendedBTCExposure.multipliedBy(collateralPrice);
     const vesuBTCExposureUSD = collateralUnits.multipliedBy(collateralPrice);
     const numerator1 = vesu_leverage * amount + vesuBTCExposureUSD.toNumber();
     const numerator2 = extendedExposureUSD.toNumber();

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

@@ -238,8 +238,8 @@ export class VesuExtendedMultiplierStrategy<
       const balance = await this.getUnusedBalance();
       const usdcBalanceOnExtended = await extendedAdapter.getExtendedDepositAmount();
       /** The LIMIT_BALANCE is the bffer amount to keep in the investing Cycle */
-      const amountToInvest = balance.amount.plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).minus(LIMIT_BALANCE);
-
+      const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).minus(LIMIT_BALANCE);
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldInvest amountToInvest: ${amountToInvest.toNumber()}`);
       if (amountToInvest.lessThan(0)) {
         return {
           shouldInvest: false,
@@ -301,6 +301,7 @@ export class VesuExtendedMultiplierStrategy<
           vesuLeverage: 0,
         };
       }
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::shouldInvest vesu_amount: ${vesu_amount.toNumber()}, extended_amount: ${extended_amount.toNumber()}`);
       return {
         shouldInvest: true,
         vesuAmount: vesu_amount,
@@ -384,16 +385,16 @@ export class VesuExtendedMultiplierStrategy<
       }
       const usdcAmountInWallet = (await this.getUnusedBalance()).amount;
       const usdcAmountOnExtended = parseFloat(
-        extendedHoldings.availableForTrade
+        extendedHoldings.availableForWithdrawal
       );
-      if (extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended).greaterThan(0)) {
+      if (extendedAmount.minus(usdcAmountOnExtended).greaterThan(0)) {
         //move assets to extended
         try {
           const { calls: extendedCalls } = await this.moveAssets(
             {
               to: Protocols.EXTENDED.name,
               from: Protocols.VAULT.name,
-              amount: extendedAmount.plus(BUFFER_USDC_IN_WITHDRAWAL).minus(usdcAmountOnExtended),
+              amount: extendedAmount.minus(usdcAmountOnExtended),
             },
             extendedAdapter,
             vesuAdapter
@@ -517,7 +518,7 @@ export class VesuExtendedMultiplierStrategy<
           * We need to move assets from my wallet back to vault contract
           */
           const extendedHoldings = await extendedAdapter.getExtendedDepositAmount();
-          logger.info(`extendedHoldings after withdrawal ${extendedHoldings}`);
+          logger.info(`extendedHoldings after withdrawal ${extendedHoldings?.availableForWithdrawal}`);
           await new Promise(resolve => setTimeout(resolve, 10000));
           const calls = await this.moveAssetsToVaultAllocator(params.amount, extendedAdapter);
           if (calls.length > 0) {
@@ -659,7 +660,7 @@ export class VesuExtendedMultiplierStrategy<
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForTrade,
+        extendedHoldings.availableForWithdrawal,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -719,7 +720,7 @@ export class VesuExtendedMultiplierStrategy<
       return {
         extendedAmountInBTC: new Web3Number(0, 0),
         calls: [],
-      };;
+      };
     }
   }