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

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

@@ -4,7 +4,7 @@ import {
   WithdrawParams,
   BaseAdapterConfig,
 } from "./baseAdapter";
-import { SIMPLE_SANITIZER_V2, toBigInt } from "./adapter-utils";
+import { toBigInt } from "./adapter-utils";
 import { Protocols } from "@/interfaces";
 import { MAX_DELAY } from "../vesu-extended-strategy/utils/constants";
 import { SupportedPosition } from "./baseAdapter";
@@ -13,14 +13,13 @@ import { Web3Number } from "@/dataTypes";
 import { PositionInfo } from "./baseAdapter";
 import { ManageCall } from "./baseAdapter";
 import { ContractAddr } from "@/dataTypes";
-import { TokenInfo } from "@/interfaces";
 import { AVNU_EXCHANGE } from "./adapter-utils";
 import { MAX_RETRIES } from "../vesu-extended-strategy/utils/constants";
 import { Quote } from "@avnu/avnu-sdk";
 import { hash, uint256 } from "starknet";
 import { AvnuWrapper } from "@/modules/avnu";
 import axios from "axios";
-import { AVNU_MIDDLEWARE, SIMPLE_SANITIZER } from "./adapter-utils";
+import {SIMPLE_SANITIZER } from "./adapter-utils";
 import { returnFormattedAmount } from "../vesu-extended-strategy/utils/helper";
 import { logger } from "@/utils";
 export interface AvnuAdapterConfig extends BaseAdapterConfig {

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

@@ -67,9 +67,11 @@ export class ExtendedAdapter extends BaseAdapter<
       timeout: this.config.extendedTimeout,
       retries: this.config.extendedRetries,
     });
-    this.minimumExtendedMovementAmount = this.config.minimumExtendedMovementAmount ?? 5; //5 usdc
+    this.minimumExtendedMovementAmount =
+      this.config.minimumExtendedMovementAmount ?? 5; //5 usdc
     this.client = client;
-    this.retryDelayForOrderStatus = this.config.retryDelayForOrderStatus ?? 3000;
+    this.retryDelayForOrderStatus =
+      this.config.retryDelayForOrderStatus ?? 3000;
   }
   //abstract means the method has no implementation in this class; instead, child classes must implement it.
   protected async getAPY(
@@ -416,11 +418,58 @@ export class ExtendedAdapter extends BaseAdapter<
   async withdrawFromExtended(amount: Web3Number): Promise<boolean> {
     try {
       if (!this.client) {
-        throw new Error("Client not initialized");
+        logger.error("Client not initialized");
+        return false;
+      }
+      if (amount.lessThanOrEqualTo(0)) {
+        logger.error(
+          `Invalid withdrawal amount: ${amount.toNumber()}. Amount must be positive.`
+        );
+        return false;
+      }
+      if (amount.lessThanOrEqualTo(this.minimumExtendedMovementAmount)) {
+        logger.warn(
+          `Withdrawal amount ${amount.toNumber()} is below minimum Extended movement amount ${this.minimumExtendedMovementAmount}. Skipping withdrawal.`
+        );
+        return false;
+      }
+      const holdings = await this.getExtendedDepositAmount();
+      if (!holdings) {
+        logger.error(
+          "Cannot get holdings - unable to validate withdrawal amount"
+        );
+        return false;
+      }
+
+      const availableForWithdrawal = parseFloat(
+        holdings.availableForWithdrawal
+      );
+      if (
+        !Number.isFinite(availableForWithdrawal) ||
+        availableForWithdrawal < 0
+      ) {
+        logger.error(
+          `Invalid availableForWithdrawal: ${holdings.availableForWithdrawal}. Expected a finite, non-negative number.`
+        );
+        return false;
       }
+
+      const withdrawalAmount = amount.toNumber();
+      if (withdrawalAmount > availableForWithdrawal) {
+        logger.error(
+          `Withdrawal amount ${withdrawalAmount} exceeds available balance ${availableForWithdrawal}`
+        );
+        return false;
+      }
+
+      logger.info(
+        `Withdrawing ${withdrawalAmount} from Extended. Available balance: ${availableForWithdrawal}`
+      );
+
       const withdrawalRequest = await this.client.withdrawUSDC(
         amount.toFixed(2)
       );
+
       if (withdrawalRequest.status === "OK") {
         const withdrawalStatus = await this.getDepositOrWithdrawalStatus(
           withdrawalRequest.data,
@@ -428,6 +477,10 @@ export class ExtendedAdapter extends BaseAdapter<
         );
         return withdrawalStatus;
       }
+
+      logger.error(
+        `Withdrawal request failed with status: ${withdrawalRequest.status}`
+      );
       return false;
     } catch (error) {
       logger.error(`Error creating Withdraw Call: ${error}`);
@@ -440,21 +493,47 @@ export class ExtendedAdapter extends BaseAdapter<
   }
 
   async getExtendedDepositAmount(): Promise<Balance | undefined> {
-    if (this.client === null) {
-      logger.error("error initializing client");
-      return undefined;
-    }
-    const result = await this.client.getHoldings();
-    if (!result) {
-      logger.error(`error getting holdings: ${result}`);
-      return undefined;
-    }
-    const holdings = result.data;
-    if (!holdings) {
-      logger.error(`error getting holdings: ${holdings}`);
+    try {
+      if (this.client === null) {
+        logger.error("error initializing client - client is null");
+        return undefined; // Error: client not initialized
+      }
+
+      const result = await this.client.getHoldings();
+      if (!result) {
+        logger.error("error getting holdings - API returned null/undefined");
+        return undefined;
+      }
+
+      if (result.status && result.status !== "OK") {
+        logger.error(
+          `error getting holdings - API returned status: ${result.status}`
+        );
+        return undefined;
+      }
+
+      const holdings = result.data;
+      if (!holdings) {
+        logger.warn(
+          "holdings data is null/undefined - treating as zero balance"
+        );
+        return {
+          collateral_name: "",
+          balance: "0",
+          equity: "0",
+          availableForTrade: "0",
+          availableForWithdrawal: "0",
+          unrealisedPnl: "0",
+          initialMargin: "0",
+          marginRatio: "0",
+          updatedTime: Date.now(),
+        };
+      }
+      return holdings;
+    } catch (error) {
+      logger.error(`error getting holdings - exception: ${error}`);
       return undefined;
     }
-    return holdings;
   }
 
   async setLeverage(leverage: string, marketName: string): Promise<boolean> {
@@ -503,50 +582,29 @@ export class ExtendedAdapter extends BaseAdapter<
     orderId: string,
     marketName: string
   ): Promise<OpenOrder | null> {
-    if (this.client === null) {
-      logger.error("error initializing client");
-      return null;
-    }
-    let orderhistory = await this.getOrderHistory(marketName);
-
-    if (!orderhistory || orderhistory.length === 0) {
-      logger.error(`error getting order history: ${orderId}`);
-    } else {
-      const order = orderhistory
-        .slice(0, 10)
-        .find((order) => order.id.toString() === orderId);
-      if (order) {
-        return order;
+    try {
+      if (this.client === null) {
+        logger.error("error initializing client");
+        return null;
       }
-    }
-
-    // Retry logic: 3 more attempts with 3 second delay each
-    for (let attempt = 1; attempt <= 5; attempt++) {
-      await new Promise((resolve) => setTimeout(resolve, this.retryDelayForOrderStatus));
-      orderhistory = await this.getOrderHistory(marketName);
+      const orderhistory = await this.getOrderHistory(marketName);
 
       if (!orderhistory || orderhistory.length === 0) {
-        logger.error(
-          `error getting order history on retry ${attempt}: ${orderId}`
-        );
-        continue;
+        return null;
       }
-
       const order = orderhistory
-        .slice(0, 5)
+        .slice(0, 20)
         .find((order) => order.id.toString() === orderId);
 
-      if (order && order.status === OrderStatus.FILLED) {
+      if (order) {
         return order;
       }
 
-      logger.error(
-        `order not found in top 15 entries on retry ${attempt}: ${orderId}`
-      );
+      return null; // Order not found
+    } catch (error) {
+      logger.error(`error getting order status: ${error}`);
+      return null;
     }
-
-    logger.error(`error getting order after all retries: ${orderId}`);
-    return null;
   }
 
   async fetchOrderBookBTCUSDC(): Promise<{
@@ -608,16 +666,60 @@ export class ExtendedAdapter extends BaseAdapter<
         logger.error("error depositing or setting leverage");
         return null;
       }
-      const positions = await this.getAllOpenPositions();
-      if (positions === null) {
+      const { ask, bid } = await this.fetchOrderBookBTCUSDC();
+      if (
+        !ask ||
+        !bid ||
+        ask.lessThanOrEqualTo(0) ||
+        bid.lessThanOrEqualTo(0)
+      ) {
+        logger.error(
+          `Invalid orderbook prices: ask=${ask?.toNumber()}, bid=${bid?.toNumber()}`
+        );
         return null;
       }
-      const { ask, bid } = await this.fetchOrderBookBTCUSDC();
+
       const spread = ask.minus(bid);
-      let price = ask.plus(bid).div(2);
-      side === OrderSide.SELL
-        ? (price = price.minus(spread.times(0.2 * attempt)))
-        : (price = price.plus(spread.times(0.2 * attempt)));
+      const midPrice = ask.plus(bid).div(2);
+      /**  Maximum deviation: 50% of spread (to prevent extremely unfavorable prices) */
+      const MAX_PRICE_DEVIATION_MULTIPLIER = 0.5;
+      const priceAdjustmentMultiplier = Math.min(
+        0.2 * attempt,
+        MAX_PRICE_DEVIATION_MULTIPLIER
+      );
+      const priceAdjustment = spread.times(priceAdjustmentMultiplier);
+
+      let price = midPrice;
+      if (side === OrderSide.SELL) {
+        price = midPrice.minus(priceAdjustment);
+      } else {
+        price = midPrice.plus(priceAdjustment);
+      }
+
+      /**  Validate price is still reasonable (within 50% of mid price) */
+      const maxDeviation = midPrice.times(0.5);
+      if (price.minus(midPrice).abs().greaterThan(maxDeviation)) {
+        logger.error(
+          `Price deviation too large on attempt ${attempt}: price=${price.toNumber()}, midPrice=${midPrice.toNumber()}, deviation=${price
+            .minus(midPrice)
+            .abs()
+            .toNumber()}`
+        );
+        if (attempt >= maxAttempts) {
+          return null;
+        }
+        price =
+          side === OrderSide.SELL
+            ? midPrice.minus(maxDeviation)
+            : midPrice.plus(maxDeviation);
+      }
+
+      logger.info(
+        `createOrder attempt ${attempt}/${maxAttempts}: side=${side}, midPrice=${midPrice.toNumber()}, adjustedPrice=${price.toNumber()}, adjustment=${
+          priceAdjustmentMultiplier * 100
+        }%`
+      );
+
       const amount_in_token = (btcAmount * parseInt(leverage)).toFixed(
         this.config.extendedPrecision
       ); // gives the amount of wbtc
@@ -629,17 +731,66 @@ export class ExtendedAdapter extends BaseAdapter<
         price.toFixed(0),
         side
       );
-      if (!result) {
+      if (!result || !result.position_id) {
+        logger.error("Failed to create order - no position_id returned");
         return null;
       }
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-      const openOrder = await this.getOrderStatus(
-        result.position_id,
+
+      const positionId = result.position_id;
+      logger.info(
+        `Order created with position_id: ${positionId}. Waiting for API to update...`
+      );
+
+      let openOrder = await this.getOrderStatus(
+        positionId,
         this.config.extendedMarketName
       );
+      const maxStatusRetries = 3;
+      const statusRetryDelay = 5000;
+
       if (!openOrder) {
+        logger.warn(
+          `Order ${positionId} not found in API yet. Retrying status fetch (max ${maxStatusRetries} times)...`
+        );
+        for (
+          let statusRetry = 1;
+          statusRetry <= maxStatusRetries;
+          statusRetry++
+        ) {
+          await new Promise((resolve) => setTimeout(resolve, statusRetryDelay));
+          openOrder = await this.getOrderStatus(
+            positionId,
+            this.config.extendedMarketName
+          );
+          if (openOrder) {
+            logger.info(
+              `Order ${positionId} found after ${statusRetry} status retry(ies)`
+            );
+            break;
+          }
+          logger.warn(
+            `Order ${positionId} still not found after ${statusRetry}/${maxStatusRetries} status retries`
+          );
+        }
+      }
+
+      if (openOrder && openOrder.status === OrderStatus.FILLED) {
+        logger.info(
+          `Order ${positionId} successfully filled with quantity ${openOrder.qty}`
+        );
+        return {
+          position_id: positionId,
+          btc_exposure: openOrder.qty,
+        };
+      } else if (openOrder && openOrder.status !== OrderStatus.FILLED) {
+        // Order found but NOT FILLED - retry (recreate)
+        logger.warn(
+          `Order ${positionId} found but status is ${openOrder.status}, not FILLED. Retrying order creation...`
+        );
         if (attempt >= maxAttempts) {
-          logger.error("Max retries reached — could not verify open position");
+          logger.error(
+            `Max retries reached — order ${positionId} status is ${openOrder.status}, not FILLED`
+          );
           return null;
         } else {
           const backoff = 2000 * attempt;
@@ -653,9 +804,12 @@ export class ExtendedAdapter extends BaseAdapter<
           );
         }
       } else {
+       logger.warn(
+          `Order ${positionId} not found in API after ${maxStatusRetries} status retries (API update delayed ~30s). We got position_id from creation, so order exists. Returning position_id - status will be checked in next loop iteration.`
+        );
         return {
-          position_id: result.position_id,
-          btc_exposure: openOrder.qty,
+          position_id: positionId,
+          btc_exposure: amount_in_token,
         };
       }
     } catch (err: any) {