@strkfarm/sdk 2.0.0-dev.5 → 2.0.0-dev.7

package/dist/index.browser.global.js

@@ -92380,7 +92380,7 @@ spurious results.`);
   var MAX_RETRIES = Number(process.env.MAX_RETRIES ?? 3);
   var MAX_DELAY = Number(process.env.MAX_DELAY ?? 100);
   var EXTEND_MARKET_NAME = "BTC-USD";
-  var LIMIT_BALANCE = Number(process.env.LIMIT_BALANCE ?? 10);
+  var LIMIT_BALANCE = Number(process.env.LIMIT_BALANCE ?? 0.05);
   var REBALANCER_INTERVAL = Number(process.env.REBALANCER_INTERVAL ?? 18e4);
   var WITHDRAWAL_INTERVAL = Number(process.env.WITHDRAWAL_INTERVAL ?? 18e6);
   var INVESTING_INTERVAL = Number(process.env.INVESTING_INTERVAL ?? 18e4);
@@ -92419,8 +92419,7 @@ spurious results.`);
           vesu_leverage: 0
         };
       }
-      const extendedBTCExposure = extendedPosition.length > 0 ? new Web3Number(extendedPosition[0].size, WBTC_TOKEN_DECIMALS) : new Web3Number(0, WBTC_TOKEN_DECIMALS);
-      const extendedExposureUSD = extendedBTCExposure.multipliedBy(collateralPrice);
+      const extendedExposureUSD = extendedPosition.length > 0 ? new Web3Number(extendedPosition[0].value, WBTC_TOKEN_DECIMALS) : new Web3Number(0, WBTC_TOKEN_DECIMALS);
       const vesuBTCExposureUSD = collateralUnits.multipliedBy(collateralPrice);
       const numerator1 = vesu_leverage * amount + vesuBTCExposureUSD.toNumber();
       const numerator2 = extendedExposureUSD.toNumber();
@@ -92638,6 +92637,7 @@ spurious results.`);
         vaultAllocator: config3.vaultAllocator,
         id: ""
       });
+      this.minimumVesuMovementAmount = config3.minimumVesuMovementAmount ?? 5;
       this.tokenMarketData = new TokenMarketData(
         this.config.pricer,
         this.config.networkConfig
@@ -93646,12 +93646,17 @@ spurious results.`);
         timeout: this.config.extendedTimeout,
         retries: this.config.extendedRetries
       });
+      this.minimumExtendedMovementAmount = this.config.minimumExtendedMovementAmount ?? 5;
       this.client = client;
+      this.retryDelayForOrderStatus = this.config.retryDelayForOrderStatus ?? 3e3;
     }
     //abstract means the method has no implementation in this class; instead, child classes must implement it.
     async getAPY(supportedPosition) {
       const side = supportedPosition.isDebt ? "LONG" : "SHORT";
-      const fundingRates = await this.client.getFundingRates(this.config.extendedMarketName, side);
+      const fundingRates = await this.client.getFundingRates(
+        this.config.extendedMarketName,
+        side
+      );
       if (fundingRates.status !== "OK") {
         logger2.error("error getting funding rates", fundingRates);
         return { apy: 0, type: "base" /* BASE */ };
@@ -93695,14 +93700,14 @@ spurious results.`);
       });
     }
     _getDepositLeaf() {
-      const usdceToken = Global.getDefaultTokens().find((token) => token.symbol === "USDCe");
+      const usdceToken = Global.getDefaultTokens().find(
+        (token) => token.symbol === "USDCe"
+      );
       return [
         {
           target: this.config.supportedPositions[0].asset.address,
           method: "approve",
-          packedArguments: [
-            AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt()
-          ],
+          packedArguments: [AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt()],
           id: `extended_approve_${this.config.supportedPositions[0].asset.symbol}`,
           sanitizer: AVNU_LEGACY_SANITIZER
         },
@@ -93733,25 +93738,33 @@ spurious results.`);
       const leafConfigs = this._getSwapFromLegacyLeaf();
       const leaves = leafConfigs.map((config3) => {
         const { target, method, packedArguments, sanitizer, id } = config3;
-        const leaf = this.constructSimpleLeafData({
-          id,
-          target,
-          method,
-          packedArguments
-        }, sanitizer);
+        const leaf = this.constructSimpleLeafData(
+          {
+            id,
+            target,
+            method,
+            packedArguments
+          },
+          sanitizer
+        );
         return leaf;
       });
-      return { leaves, callConstructor: this.getSwapFromLegacyCall.bind(this) };
+      return {
+        leaves,
+        callConstructor: this.getSwapFromLegacyCall.bind(
+          this
+        )
+      };
     }
     _getSwapFromLegacyLeaf() {
-      const usdceToken = Global.getDefaultTokens().find((token) => token.symbol === "USDCe");
+      const usdceToken = Global.getDefaultTokens().find(
+        (token) => token.symbol === "USDCe"
+      );
       return [
         {
           target: usdceToken.address,
           method: "approve",
-          packedArguments: [
-            AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt()
-          ],
+          packedArguments: [AVNU_EXCHANGE_FOR_LEGACY_USDC.toBigInt()],
           id: `extendedswaplegacyapprove_${usdceToken.symbol}`,
           sanitizer: AVNU_LEGACY_SANITIZER
         },
@@ -93770,11 +93783,13 @@ spurious results.`);
     async getDepositCall(params) {
       try {
         const usdcToken = this.config.supportedPositions[0].asset;
-        const usdceToken = Global.getDefaultTokens().find((token) => token.symbol === "USDCe");
-        const salt = Math.floor(
-          Math.random() * 10 ** usdcToken.decimals
+        const usdceToken = Global.getDefaultTokens().find(
+          (token) => token.symbol === "USDCe"
+        );
+        const salt = Math.floor(Math.random() * 10 ** usdcToken.decimals);
+        const amount = uint256_exports.bnToUint256(
+          params.amount.multipliedBy(10).toWei()
         );
-        const amount = uint256_exports.bnToUint256(params.amount.multipliedBy(10).toWei());
         const quotes = await this.config.avnuAdapter.getQuotesAvnu(
           usdcToken.address.toString(),
           usdceToken.address.toString(),
@@ -93787,7 +93802,9 @@ spurious results.`);
           logger2.error("error getting quotes from avnu");
           return [];
         }
-        const getCalldata = await this.config.avnuAdapter.getSwapCallData(quotes);
+        const getCalldata = await this.config.avnuAdapter.getSwapCallData(
+          quotes
+        );
         const swapCallData = getCalldata[0];
         return [
           {
@@ -93863,8 +93880,12 @@ spurious results.`);
     async getSwapFromLegacyCall(params) {
       try {
         const usdcToken = this.config.supportedPositions[0].asset;
-        const usdceToken = Global.getDefaultTokens().find((token) => token.symbol === "USDCe");
-        const amount = uint256_exports.bnToUint256(params.amount.multipliedBy(10).toWei());
+        const usdceToken = Global.getDefaultTokens().find(
+          (token) => token.symbol === "USDCe"
+        );
+        const amount = uint256_exports.bnToUint256(
+          params.amount.multipliedBy(10).toWei()
+        );
         const quotes = await this.config.avnuAdapter.getQuotesAvnu(
           usdceToken.address.toString(),
           usdcToken.address.toString(),
@@ -93877,7 +93898,9 @@ spurious results.`);
           logger2.error("error getting quotes from avnu");
           return [];
         }
-        const getCalldata = await this.config.avnuAdapter.getSwapCallData(quotes);
+        const getCalldata = await this.config.avnuAdapter.getSwapCallData(
+          quotes
+        );
         const swapCallData = getCalldata[0];
         return [
           {
@@ -93925,9 +93948,14 @@ spurious results.`);
         if (!this.client) {
           throw new Error("Client not initialized");
         }
-        const withdrawalRequest = await this.client.withdrawUSDC(amount.toFixed(2));
+        const withdrawalRequest = await this.client.withdrawUSDC(
+          amount.toFixed(2)
+        );
         if (withdrawalRequest.status === "OK") {
-          const withdrawalStatus = await this.getDepositOrWithdrawalStatus(withdrawalRequest.data, "WITHDRAWAL" /* WITHDRAWAL */);
+          const withdrawalStatus = await this.getDepositOrWithdrawalStatus(
+            withdrawalRequest.data,
+            "WITHDRAWAL" /* WITHDRAWAL */
+          );
           return withdrawalStatus;
         }
         return false;
@@ -94000,18 +94028,34 @@ spurious results.`);
         logger2.error("error initializing client");
         return null;
       }
-      await new Promise((resolve) => setTimeout(resolve, 5e3));
-      const orderhistory = await this.getOrderHistory(marketName);
+      let orderhistory = await this.getOrderHistory(marketName);
       if (!orderhistory || orderhistory.length === 0) {
-        logger2.error(`error getting order: ${orderId}`);
-        return null;
+        logger2.error(`error getting order history: ${orderId}`);
+      } else {
+        const order = orderhistory.slice(0, 10).find((order2) => order2.id.toString() === orderId);
+        if (order) {
+          return order;
+        }
       }
-      const order = orderhistory.slice(0, 3).find((order2) => order2.id.toString() === orderId);
-      if (!order) {
-        logger2.error(`error getting order: ${order}`);
-        return null;
+      for (let attempt = 1; attempt <= 5; attempt++) {
+        await new Promise((resolve) => setTimeout(resolve, this.retryDelayForOrderStatus));
+        orderhistory = await this.getOrderHistory(marketName);
+        if (!orderhistory || orderhistory.length === 0) {
+          logger2.error(
+            `error getting order history on retry ${attempt}: ${orderId}`
+          );
+          continue;
+        }
+        const order = orderhistory.slice(0, 5).find((order2) => order2.id.toString() === orderId);
+        if (order && order.status === "FILLED" /* FILLED */) {
+          return order;
+        }
+        logger2.error(
+          `order not found in top 15 entries on retry ${attempt}: ${orderId}`
+        );
       }
-      return order;
+      logger2.error(`error getting order after all retries: ${orderId}`);
+      return null;
     }
     async fetchOrderBookBTCUSDC() {
       try {
@@ -94084,8 +94128,11 @@ spurious results.`);
           return null;
         }
         await new Promise((resolve) => setTimeout(resolve, 5e3));
-        const openOrder = await this.getOrderStatus(result2.position_id, this.config.extendedMarketName);
-        if (!openOrder || openOrder.status !== "FILLED" /* FILLED */) {
+        const openOrder = await this.getOrderStatus(
+          result2.position_id,
+          this.config.extendedMarketName
+        );
+        if (!openOrder) {
           if (attempt >= maxAttempts) {
             logger2.error("Max retries reached \u2014 could not verify open position");
             return null;
@@ -94107,7 +94154,9 @@ spurious results.`);
           };
         }
       } catch (err2) {
-        logger2.error(`createShortOrder failed on attempt ${attempt}: ${err2.message}`);
+        logger2.error(
+          `createShortOrder failed on attempt ${attempt}: ${err2.message}`
+        );
         if (attempt < maxAttempts) {
           const backoff = 1200 * attempt;
           logger2.info(`Retrying after ${backoff}ms...`);
@@ -94152,13 +94201,17 @@ spurious results.`);
           operationsStatus: ["COMPLETED" /* COMPLETED */]
         });
         if (operationsType === "DEPOSIT" /* DEPOSIT */) {
-          const myTransferStatus = transferHistory.data.find((operation) => operation.transactionHash === orderId);
+          const myTransferStatus = transferHistory.data.find(
+            (operation) => operation.transactionHash === orderId
+          );
           if (!myTransferStatus) {
             return true;
           }
           return true;
         } else {
-          const myTransferStatus = transferHistory.data.find((operation) => operation.id.toString() === orderId.toString());
+          const myTransferStatus = transferHistory.data.find(
+            (operation) => operation.id.toString() === orderId.toString()
+          );
           if (!myTransferStatus) {
             return true;
           }
@@ -97430,7 +97483,8 @@ spurious results.`);
       minHealthFactor: vaultSettings.minHealthFactor,
       quoteAmountToFetchPrice: vaultSettings.quoteAmountToFetchPrice,
       ...baseAdapterConfig,
-      supportedPositions: [{ asset: lstToken, isDebt: false }, { asset: Global.getDefaultTokens().find((token) => token.symbol === position), isDebt: true }]
+      supportedPositions: [{ asset: lstToken, isDebt: false }, { asset: Global.getDefaultTokens().find((token) => token.symbol === position), isDebt: true }],
+      minimumVesuMovementAmount: 0
     }));
     const unusedBalanceAdapter = new UnusedBalanceAdapter({
       ...baseAdapterConfig
@@ -97889,7 +97943,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 = 1e3) {
+    async getQuotesAvnu(from_token_address, to_token_address, amount, takerAddress, toTokenDecimals, usdcToBtc, maxIterations = 5, tolerance = 5e3) {
       try {
         const fromToken = this.config.supportedPositions[0].asset;
         const toToken = this.config.supportedPositions[1].asset;
@@ -98129,7 +98183,8 @@ spurious results.`);
         }
         const balance = await this.getUnusedBalance();
         const usdcBalanceOnExtended = await extendedAdapter.getExtendedDepositAmount();
-        const amountToInvest = balance.amount.plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).minus(LIMIT_BALANCE);
+        const amountToInvest = new Web3Number(balance.usdValue, USDC_TOKEN_DECIMALS).plus(usdcBalanceOnExtended?.availableForWithdrawal ?? 0).multipliedBy(1 - LIMIT_BALANCE);
+        logger2.info(`${_VesuExtendedMultiplierStrategy.name}::shouldInvest amountToInvest: ${amountToInvest.toNumber()}`);
         if (amountToInvest.lessThan(0)) {
           return {
             shouldInvest: false,
@@ -98182,6 +98237,7 @@ spurious results.`);
             vesuLeverage: 0
           };
         }
+        logger2.info(`${_VesuExtendedMultiplierStrategy.name}::shouldInvest vesu_amount: ${vesu_amount.toNumber()}, extended_amount: ${extended_amount.toNumber()}`);
         return {
           shouldInvest: true,
           vesuAmount: vesu_amount,
@@ -98215,7 +98271,7 @@ spurious results.`);
           );
           return calls;
         }
-        if (extendedAmount.lessThan(0)) {
+        if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
           try {
             const { calls: extendedCalls, status: extendedStatus } = await this.moveAssets(
               {
@@ -98235,7 +98291,7 @@ spurious results.`);
             logger2.error(`Failed moving assets to vault: ${err2}`);
           }
         }
-        if (vesuAmount.lessThan(0)) {
+        if (vesuAmount.isNegative() && vesuAmount.lessThan(vesuAdapter.minimumVesuMovementAmount)) {
           try {
             const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
               {
@@ -98261,15 +98317,15 @@ spurious results.`);
         }
         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(extendedAdapter.minimumExtendedMovementAmount)) {
           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
@@ -98279,7 +98335,7 @@ spurious results.`);
             logger2.error(`Failed moving assets to extended: ${err2}`);
           }
         }
-        if (vesuAmount.minus(usdcAmountInWallet).greaterThan(0)) {
+        if (vesuAmount.minus(usdcAmountInWallet).greaterThan(vesuAdapter.minimumVesuMovementAmount)) {
           try {
             const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
               {
@@ -98507,7 +98563,7 @@ spurious results.`);
           };
         }
         const extendedHoldingAmount = new Web3Number(
-          extendedHoldings.availableForTrade,
+          extendedHoldings.availableForWithdrawal,
           USDC_TOKEN_DECIMALS
         );
         const {
@@ -98567,7 +98623,6 @@ spurious results.`);
           extendedAmountInBTC: new Web3Number(0, 0),
           calls: []
         };
-        ;
       }
     }
     async checkPriceDifferenceBetweenAvnuAndExtended(extendedAdapter, vesuAdapter, avnuAdapter) {
@@ -98745,7 +98800,7 @@ spurious results.`);
       };
     }
   };
-  function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1, extendedBackendUrl, extendedApiKey, vaultIdExtended) {
+  function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1, extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus) {
     vaultSettings.leafAdapters = [];
     const wbtcToken = Global.getDefaultTokens().find(
       (token) => token.symbol === lstSymbol
@@ -98785,7 +98840,10 @@ spurious results.`);
       extendedBaseUrl: "https://api.starknet.extended.exchange",
       extendedMarketName: "BTC-USD",
       extendedPrecision: 5,
-      avnuAdapter
+      avnuAdapter,
+      retryDelayForOrderStatus: minimumExtendedRetriesDelayForOrderStatus ?? 3e3,
+      minimumExtendedMovementAmount: minimumExtendedMovementAmount ?? 5
+      //5 usdcs
     });
     const vesuMultiplyAdapter = new VesuMultiplyAdapter({
       poolId: pool1,
@@ -98798,7 +98856,9 @@ spurious results.`);
       supportedPositions: [
         { asset: wbtcToken, isDebt: false },
         { asset: usdcToken, isDebt: true }
-      ]
+      ],
+      minimumVesuMovementAmount: minimumVesuMovementAmount ?? 5
+      //5 usdc
     });
     const unusedBalanceAdapter = new UnusedBalanceAdapter({
       ...baseAdapterConfig
@@ -98913,12 +98973,12 @@ spurious results.`);
     borrowable_assets: [Global.getDefaultTokens().find((token) => token.symbol === "WBTC")],
     minimumWBTCDifferenceForAvnuSwap: MINIMUM_WBTC_DIFFERENCE_FOR_AVNU_SWAP
   };
-  var VesuExtendedTestStrategies = (extendedBackendUrl, extendedApiKey, vaultIdExtended) => {
+  var VesuExtendedTestStrategies = (extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus) => {
     return [
-      getStrategySettingsVesuExtended("WBTC", "USDC", re7UsdcPrimeDevansh, false, false, extendedBackendUrl, extendedApiKey, vaultIdExtended)
+      getStrategySettingsVesuExtended("WBTC", "USDC", re7UsdcPrimeDevansh, false, false, extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus)
     ];
   };
-  function getStrategySettingsVesuExtended(lstSymbol, underlyingSymbol, addresses, isPreview = false, isLST, extendedBackendUrl, extendedApiKey, vaultIdExtended) {
+  function getStrategySettingsVesuExtended(lstSymbol, underlyingSymbol, addresses, isPreview = false, isLST, extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus) {
     return {
       name: `Extended Test ${underlyingSymbol}`,
       description: getDescription2(lstSymbol, underlyingSymbol),
@@ -98926,7 +98986,7 @@ spurious results.`);
       launchBlock: 0,
       type: "Other",
       depositTokens: [Global.getDefaultTokens().find((token) => token.symbol === underlyingSymbol)],
-      additionalInfo: getLooperSettings2(lstSymbol, underlyingSymbol, addresses, VesuPools.Re7USDCPrime, extendedBackendUrl, extendedApiKey, vaultIdExtended),
+      additionalInfo: getLooperSettings2(lstSymbol, underlyingSymbol, addresses, VesuPools.Re7USDCPrime, extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus),
       risk: {
         riskFactor: _riskFactor3,
         netRisk: _riskFactor3.reduce((acc, curr) => acc + curr.value * curr.weight, 0) / _riskFactor3.reduce((acc, curr) => acc + curr.weight, 0),