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

package/dist/index.mjs

@@ -28026,7 +28026,7 @@ var STRK_API_RPC = process.env.STRK_API_RPC ?? "https://mainnet.starknet.a5a.ch"
 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);
@@ -28065,8 +28065,7 @@ var calculateAmountDistribution = async (amount, client, marketName, collateralP
         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();
@@ -28284,6 +28283,7 @@ var VesuMultiplyAdapter = class _VesuMultiplyAdapter extends BaseAdapter {
       vaultAllocator: config.vaultAllocator,
       id: ""
     });
+    this.minimumVesuMovementAmount = config.minimumVesuMovementAmount ?? 5;
     this.tokenMarketData = new TokenMarketData(
       this.config.pricer,
       this.config.networkConfig
@@ -29630,12 +29630,17 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
       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") {
       logger.error("error getting funding rates", fundingRates);
       return { apy: 0, type: "base" /* BASE */ };
@@ -29679,14 +29684,14 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
     });
   }
   _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
       },
@@ -29717,25 +29722,33 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
     const leafConfigs = this._getSwapFromLegacyLeaf();
     const leaves = leafConfigs.map((config) => {
       const { target, method, packedArguments, sanitizer, id } = config;
-      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
       },
@@ -29754,11 +29767,13 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
   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 = uint25613.bnToUint256(
+        params.amount.multipliedBy(10).toWei()
       );
-      const amount = uint25613.bnToUint256(params.amount.multipliedBy(10).toWei());
       const quotes = await this.config.avnuAdapter.getQuotesAvnu(
         usdcToken.address.toString(),
         usdceToken.address.toString(),
@@ -29771,7 +29786,9 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
         logger.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 [
         {
@@ -29847,8 +29864,12 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
   async getSwapFromLegacyCall(params) {
     try {
       const usdcToken = this.config.supportedPositions[0].asset;
-      const usdceToken = Global.getDefaultTokens().find((token) => token.symbol === "USDCe");
-      const amount = uint25613.bnToUint256(params.amount.multipliedBy(10).toWei());
+      const usdceToken = Global.getDefaultTokens().find(
+        (token) => token.symbol === "USDCe"
+      );
+      const amount = uint25613.bnToUint256(
+        params.amount.multipliedBy(10).toWei()
+      );
       const quotes = await this.config.avnuAdapter.getQuotesAvnu(
         usdceToken.address.toString(),
         usdcToken.address.toString(),
@@ -29861,7 +29882,9 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
         logger.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 [
         {
@@ -29909,9 +29932,14 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
       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;
@@ -29984,18 +30012,34 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
       logger.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) {
-      logger.error(`error getting order: ${orderId}`);
-      return null;
+      logger.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) {
-      logger.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) {
+        logger.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;
+      }
+      logger.error(
+        `order not found in top 15 entries on retry ${attempt}: ${orderId}`
+      );
     }
-    return order;
+    logger.error(`error getting order after all retries: ${orderId}`);
+    return null;
   }
   async fetchOrderBookBTCUSDC() {
     try {
@@ -30068,8 +30112,11 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
         return null;
       }
       await new Promise((resolve) => setTimeout(resolve, 5e3));
-      const openOrder = await this.getOrderStatus(result.position_id, this.config.extendedMarketName);
-      if (!openOrder || openOrder.status !== "FILLED" /* FILLED */) {
+      const openOrder = await this.getOrderStatus(
+        result.position_id,
+        this.config.extendedMarketName
+      );
+      if (!openOrder) {
         if (attempt >= maxAttempts) {
           logger.error("Max retries reached \u2014 could not verify open position");
           return null;
@@ -30091,7 +30138,9 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
         };
       }
     } catch (err) {
-      logger.error(`createShortOrder failed on attempt ${attempt}: ${err.message}`);
+      logger.error(
+        `createShortOrder failed on attempt ${attempt}: ${err.message}`
+      );
       if (attempt < maxAttempts) {
         const backoff = 1200 * attempt;
         logger.info(`Retrying after ${backoff}ms...`);
@@ -30136,13 +30185,17 @@ var ExtendedAdapter = class _ExtendedAdapter extends BaseAdapter {
         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;
         }
@@ -33417,7 +33470,8 @@ function getLooperSettings(lstSymbol, underlyingSymbol, vaultSettings, pool1) {
     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
@@ -33878,7 +33932,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 = 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;
@@ -34118,7 +34172,8 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       }
       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);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldInvest amountToInvest: ${amountToInvest.toNumber()}`);
       if (amountToInvest.lessThan(0)) {
         return {
           shouldInvest: false,
@@ -34171,6 +34226,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           vesuLeverage: 0
         };
       }
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::shouldInvest vesu_amount: ${vesu_amount.toNumber()}, extended_amount: ${extended_amount.toNumber()}`);
       return {
         shouldInvest: true,
         vesuAmount: vesu_amount,
@@ -34204,7 +34260,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         );
         return calls;
       }
-      if (extendedAmount.lessThan(0)) {
+      if (extendedAmount.isNegative() && extendedAmount.abs().greaterThan(extendedAdapter.minimumExtendedMovementAmount)) {
         try {
           const { calls: extendedCalls, status: extendedStatus } = await this.moveAssets(
             {
@@ -34224,7 +34280,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           logger.error(`Failed moving assets to vault: ${err}`);
         }
       }
-      if (vesuAmount.lessThan(0)) {
+      if (vesuAmount.isNegative() && vesuAmount.lessThan(vesuAdapter.minimumVesuMovementAmount)) {
         try {
           const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
             {
@@ -34250,15 +34306,15 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       }
       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
@@ -34268,7 +34324,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
           logger.error(`Failed moving assets to extended: ${err}`);
         }
       }
-      if (vesuAmount.minus(usdcAmountInWallet).greaterThan(0)) {
+      if (vesuAmount.minus(usdcAmountInWallet).greaterThan(vesuAdapter.minimumVesuMovementAmount)) {
         try {
           const { calls: vesuCalls, status: vesuStatus } = await this.moveAssets(
             {
@@ -34496,7 +34552,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         };
       }
       const extendedHoldingAmount = new Web3Number(
-        extendedHoldings.availableForTrade,
+        extendedHoldings.availableForWithdrawal,
         USDC_TOKEN_DECIMALS
       );
       const {
@@ -34556,7 +34612,6 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
         extendedAmountInBTC: new Web3Number(0, 0),
         calls: []
       };
-      ;
     }
   }
   async checkPriceDifferenceBetweenAvnuAndExtended(extendedAdapter, vesuAdapter, avnuAdapter) {
@@ -34734,7 +34789,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
     };
   }
 };
-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
@@ -34774,7 +34829,10 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1, e
     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,
@@ -34787,7 +34845,9 @@ function getLooperSettings2(lstSymbol, underlyingSymbol, vaultSettings, pool1, e
     supportedPositions: [
       { asset: wbtcToken, isDebt: false },
       { asset: usdcToken, isDebt: true }
-    ]
+    ],
+    minimumVesuMovementAmount: minimumVesuMovementAmount ?? 5
+    //5 usdc
   });
   const unusedBalanceAdapter = new UnusedBalanceAdapter({
     ...baseAdapterConfig
@@ -34902,12 +34962,12 @@ var re7UsdcPrimeDevansh = {
   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),
@@ -34915,7 +34975,7 @@ function getStrategySettingsVesuExtended(lstSymbol, underlyingSymbol, addresses,
     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),

package/package.json

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

@@ -303,7 +303,7 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
     toTokenDecimals: number,
     usdcToBtc: boolean,
     maxIterations: number = 5,
-    tolerance: number = 1000
+    tolerance: number = 5000
   ): Promise<Quote | null>{
     try {
       const fromToken = this.config.supportedPositions[0].asset;