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

package/src/modules/ExtendedWrapperSDk/wrapper.ts

@@ -408,15 +408,19 @@ export class ExtendedWrapper {
    */
   async getFundingRates(
     marketName: string,
-    side: string
+    side: string,
+    startTime: number,
+    endTime?: number,
+     // in epoch  milliseconds
   ): Promise<ExtendedApiResponse<FundingRate[]>> {
+    const endTimeParam = endTime !== undefined ? `&end_time=${endTime}` : '';
+    const startTimeParam = startTime !== undefined ? `&start_time=${startTime}` : '';
     return this.makeRequest<FundingRate[]>(
       `/api/v1/markets/funding-rates?market_name=${encodeURIComponent(
         marketName
-      )}&side=${encodeURIComponent(side)}`
+      )}&side=${encodeURIComponent(side)}${startTimeParam}${endTimeParam}`
     );
   }
-
 }
 
 export default ExtendedWrapper;

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

@@ -8,6 +8,7 @@ import { Protocols } from "@/interfaces";
 import { SupportedPosition } from "./baseAdapter";
 import { PositionAPY, APYType, PositionAmount } from "./baseAdapter";
 import { Web3Number } from "@/dataTypes";
+import { ApiResponse } from "@/modules/ExtendedWrapperSDk";
 import { PositionInfo } from "./baseAdapter";
 import { ManageCall } from "./baseAdapter";
 import { ContractAddr } from "@/dataTypes";
@@ -34,11 +35,13 @@ import { Balance, OpenOrder, OrderStatus } from "@/modules/ExtendedWrapperSDk";
 import axios from "axios";
 import { AvnuAdapter } from "./avnu-adapter";
 import { logger } from "@/utils";
+
+
 export interface ExtendedAdapterConfig extends BaseAdapterConfig {
   vaultIdExtended: number;
   extendedContract: ContractAddr; //0x04270219d365d6b017231b52e92b3fb5d7c8378b05e9abc97724537a80e93b0f
-  extendedBackendUrl: string;
-  extendedApiKey: string;
+  extendedBackendReadUrl: string;
+  extendedBackendWriteUrl: string;
   extendedTimeout: number;
   extendedRetries: number;
   extendedBaseUrl: string;
@@ -62,8 +65,8 @@ export class ExtendedAdapter extends BaseAdapter<
     super(config, ExtendedAdapter.name, Protocols.EXTENDED);
     this.config = config as ExtendedAdapterConfig;
     const client = new ExtendedWrapper({
-      baseUrl: this.config.extendedBackendUrl,
-      apiKey: this.config.extendedApiKey,
+      baseUrl: this.config.extendedBackendWriteUrl,
+      apiKey: "",
       timeout: this.config.extendedTimeout,
       retries: this.config.extendedRetries,
     });
@@ -79,11 +82,8 @@ export class ExtendedAdapter extends BaseAdapter<
   ): Promise<PositionAPY> {
     /** Considering supportedPosiiton.isDebt as side parameter to get the funding rates */
     const side = supportedPosition.isDebt ? "LONG" : "SHORT";
-    const fundingRates = await this.client.getFundingRates(
-      this.config.extendedMarketName,
-      side
-    );
-    if (fundingRates.status !== "OK") {
+    const fundingRates = await this.getFundingRates(side);
+    if (!fundingRates.success) {
       logger.error("error getting funding rates", fundingRates);
       return { apy: 0, type: APYType.BASE };
     }
@@ -92,12 +92,29 @@ export class ExtendedAdapter extends BaseAdapter<
     return { apy: apy, type: APYType.BASE };
   }
 
+  public async getFundingRates(side: string, startTime?: number, endTime?: number): Promise<{ success: boolean, data: FundingRate[] }> {
+    try {
+      const response = await axios.get<ApiResponse<FundingRate[]>>(`${this.config.extendedBackendReadUrl}/fundingRates/${this.config.extendedMarketName}/${side}`, {
+        params: {
+          startTime: startTime ? startTime.toString() : undefined,
+          endTime: endTime ? endTime.toString() : undefined,
+        }
+      });
+      if (!response.data.success) {
+        logger.error("error getting funding rates", response.data);
+        return { success: false, data: [] };
+      }
+      logger.info("success getting funding rates", response.data.data);
+      return { success: true, data: response.data.data };
+    } catch (err) {
+      logger.error("error getting funding rates", err);
+      return { success: false, data: [] };
+    }
+  }
+
   protected async getPosition(
     supportedPosition: SupportedPosition
   ): Promise<PositionAmount> {
-    if (!this.client) {
-      throw new Error("Client not initialized");
-    }
     const holdings = await this.getExtendedDepositAmount()
     if (!holdings) {
       throw new Error("No position found");
@@ -322,8 +339,8 @@ export class ExtendedAdapter extends BaseAdapter<
   getProofsForFromLegacySwap<T>(tree: StandardMerkleTree): {
     proofs: string[][];
     callConstructor:
-      | GenerateCallFn<DepositParams>
-      | GenerateCallFn<WithdrawParams>;
+    | GenerateCallFn<DepositParams>
+    | GenerateCallFn<WithdrawParams>;
   } {
     let proofGroups: string[][] = [];
 
@@ -523,25 +540,20 @@ export class ExtendedAdapter extends BaseAdapter<
 
   async getExtendedDepositAmount(): Promise<Balance | undefined> {
     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) {
+      const result = await axios.get<ApiResponse<Balance>>(`${this.config.extendedBackendReadUrl}/holdings`);
+      if (!result.data) {
         logger.error("error getting holdings - API returned null/undefined");
         return undefined;
       }
 
-      if (result.status && result.status !== "OK") {
+      if (!result.data.success) {
         logger.error(
           `error getting holdings - API returned status: ${result.status}`
         );
         return undefined;
       }
 
-      const holdings = result.data;
+      const holdings = result.data.data;
       if (!holdings) {
         logger.warn(
           "holdings data is null/undefined - treating as zero balance"
@@ -581,30 +593,33 @@ export class ExtendedAdapter extends BaseAdapter<
   }
 
   async getAllOpenPositions(): Promise<Position[] | null> {
-    if (this.client === null) {
-      logger.error("error initializing client");
-      return null;
-    }
-    const response = await this.client.getPositionsForMarket(
-      this.config.extendedMarketName
-    );
-    if (response.status === "OK") {
-      if (response.data.length === 0) {
-        return [];
-      } else {
-        return response.data;
+    try {
+      const response = await axios.get<ApiResponse<Position[]>>(`${this.config.extendedBackendReadUrl}/positions`);
+      if (response.data.success) {
+        if (response.data.data.length === 0) {
+          return [];
+        } else {
+          return response.data.data;
+        }
       }
+      return null;
+    } catch (err) {
+      logger.error("error getting all open positions", err);
+      return null;
     }
-    return null;
   }
 
   async getOrderHistory(marketName: string): Promise<OpenOrder[] | null> {
-    if (this.client === null) {
-      logger.error("error initializing client");
+    try {
+      const result = await axios.get<ApiResponse<OpenOrder[]>>(`${this.config.extendedBackendReadUrl}/marketOrders/${marketName}`);
+      if (!result.data.success) {
+        return null;
+      }
+      return result.data.data;
+    } catch (err) {
+      logger.error("error getting order history", err);
       return null;
     }
-    const result = await this.client.getOrderHistory(marketName);
-    return result.data;
   }
 
   async getOrderStatus(
@@ -744,8 +759,7 @@ export class ExtendedAdapter extends BaseAdapter<
       }
 
       logger.info(
-        `createOrder attempt ${attempt}/${maxAttempts}: side=${side}, midPrice=${midPrice.toNumber()}, adjustedPrice=${price.toNumber()}, adjustment=${
-          priceAdjustmentMultiplier * 100
+        `createOrder attempt ${attempt}/${maxAttempts}: side=${side}, midPrice=${midPrice.toNumber()}, adjustedPrice=${price.toNumber()}, adjustment=${priceAdjustmentMultiplier * 100
         }%`
       );
 
@@ -833,7 +847,7 @@ export class ExtendedAdapter extends BaseAdapter<
           );
         }
       } else {
-       logger.warn(
+        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 {
@@ -874,13 +888,13 @@ export class ExtendedAdapter extends BaseAdapter<
       const result =
         side === OrderSide.SELL
           ? await client.createSellOrder(marketName, amount, price, {
-              postOnly: false,
-              timeInForce: TimeInForce.IOC,
-            })
+            postOnly: false,
+            timeInForce: TimeInForce.IOC,
+          })
           : await client.createBuyOrder(marketName, amount, price, {
-              postOnly: false,
-              timeInForce: TimeInForce.IOC,
-            });
+            postOnly: false,
+            timeInForce: TimeInForce.IOC,
+          });
       if (result.data.id) {
         const position_id = result.data.id.toString();
         return {

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

@@ -195,7 +195,7 @@ export class VesuExtendedMultiplierStrategy<
         WALLET_ADDRESS,
         usdceToken.decimals
       );
-      logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance.toNumber()}`);
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance}`);
       const amountToBeTransferred = amount.minimum(walletBalance);
       logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred: ${amountToBeTransferred.toNumber()}`);
   
@@ -1334,8 +1334,8 @@ function getLooperSettings(
   underlyingSymbol: string,
   vaultSettings: VesuExtendedStrategySettings,
   pool1: ContractAddr,
-  extendedBackendUrl: string,
-  extendedApiKey: string,
+  extendedBackendReadUrl: string,
+  extendedBackendWriteUrl: string,
   vaultIdExtended: number,
   minimumExtendedMovementAmount: number,
   minimumVesuMovementAmount: number,
@@ -1381,8 +1381,8 @@ function getLooperSettings(
     ],
     vaultIdExtended: vaultIdExtended,
     extendedContract: EXTENDED_CONTRACT,
-    extendedBackendUrl: extendedBackendUrl,
-    extendedApiKey: extendedApiKey,
+    extendedBackendWriteUrl: extendedBackendWriteUrl,
+    extendedBackendReadUrl: extendedBackendReadUrl,
     extendedTimeout: 30000,
     extendedRetries: 3,
     extendedBaseUrl: "https://api.starknet.extended.exchange",
@@ -1539,15 +1539,15 @@ const re7UsdcPrimeDevansh: VesuExtendedStrategySettings = {
   walletAddress: WALLET_ADDRESS,
 }
 
-export const VesuExtendedTestStrategies = (extendedBackendUrl: string, extendedApiKey: string, vaultIdExtended: number, minimumExtendedMovementAmount: number, minimumVesuMovementAmount: number, minimumExtendedRetriesDelayForOrderStatus: number, minimumExtendedPriceDifferenceForSwapOpen: number, maximumExtendedPriceDifferenceForSwapClosing: number): IStrategyMetadata<VesuExtendedStrategySettings>[] => {
+export const VesuExtendedTestStrategies = (extendedBackendReadUrl: string, extendedBackendWriteUrl: string, vaultIdExtended: number, minimumExtendedMovementAmount: number, minimumVesuMovementAmount: number, minimumExtendedRetriesDelayForOrderStatus: number, minimumExtendedPriceDifferenceForSwapOpen: number, maximumExtendedPriceDifferenceForSwapClosing: number): IStrategyMetadata<VesuExtendedStrategySettings>[] => {
   return [
-    getStrategySettingsVesuExtended('WBTC', 'USDC', re7UsdcPrimeDevansh, false, false, extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus, minimumExtendedPriceDifferenceForSwapOpen, maximumExtendedPriceDifferenceForSwapClosing),
+    getStrategySettingsVesuExtended('WBTC', 'USDC', re7UsdcPrimeDevansh, false, false, extendedBackendReadUrl, extendedBackendWriteUrl, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus, minimumExtendedPriceDifferenceForSwapOpen, maximumExtendedPriceDifferenceForSwapClosing),
   ]
 }
 
 
 
-function getStrategySettingsVesuExtended(lstSymbol: string, underlyingSymbol: string, addresses: VesuExtendedStrategySettings, isPreview: boolean = false, isLST: boolean, extendedBackendUrl: string, extendedApiKey: string, vaultIdExtended: number, minimumExtendedMovementAmount: number, minimumVesuMovementAmount: number, minimumExtendedRetriesDelayForOrderStatus: number, minimumExtendedPriceDifferenceForSwapOpen: number, maximumExtendedPriceDifferenceForSwapClosing: number): IStrategyMetadata<VesuExtendedStrategySettings> {
+function getStrategySettingsVesuExtended(lstSymbol: string, underlyingSymbol: string, addresses: VesuExtendedStrategySettings, isPreview: boolean = false, isLST: boolean, extendedBackendReadUrl: string, extendedBackendWriteUrl: string, vaultIdExtended: number, minimumExtendedMovementAmount: number, minimumVesuMovementAmount: number, minimumExtendedRetriesDelayForOrderStatus: number, minimumExtendedPriceDifferenceForSwapOpen: number, maximumExtendedPriceDifferenceForSwapClosing: number): IStrategyMetadata<VesuExtendedStrategySettings> {
   return {
     name: `Extended Test ${underlyingSymbol}`,
     description: getDescription(lstSymbol, underlyingSymbol),
@@ -1555,7 +1555,7 @@ function getStrategySettingsVesuExtended(lstSymbol: string, underlyingSymbol: st
     launchBlock: 0,
     type: 'Other',
     depositTokens: [Global.getDefaultTokens().find(token => token.symbol === underlyingSymbol)!],
-    additionalInfo: getLooperSettings(lstSymbol, underlyingSymbol, addresses, VesuPools.Re7USDCPrime, extendedBackendUrl, extendedApiKey, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus, minimumExtendedPriceDifferenceForSwapOpen, maximumExtendedPriceDifferenceForSwapClosing),
+    additionalInfo: getLooperSettings(lstSymbol, underlyingSymbol, addresses, VesuPools.Re7USDCPrime, extendedBackendReadUrl, extendedBackendWriteUrl, vaultIdExtended, minimumExtendedMovementAmount, minimumVesuMovementAmount, minimumExtendedRetriesDelayForOrderStatus, minimumExtendedPriceDifferenceForSwapOpen, maximumExtendedPriceDifferenceForSwapClosing),
     risk: {
       riskFactor: _riskFactor,
       netRisk: