@reyaxyz/api-sdk 0.157.0 → 0.159.0

package/dist/types/clients/modules/withdraw-MA.simulation/types.d.ts

@@ -1,4 +1,4 @@
-import { MarginAccountEntity, MoneyInOutChainId, TokenEntity } from '@reyaxyz/common';
+import { MarginRatioHealth, MoneyInOutChainId, TokenEntity } from '@reyaxyz/common';
 import { EditCollateralSimulationLoadDataParams } from '../edit-collateral.simulation/types';
 import { SocketWithdrawFees } from '@reyaxyz/common';
 export type WithdrawMASimulationLoadDataParams = EditCollateralSimulationLoadDataParams;
@@ -10,7 +10,7 @@ export type WithdrawMASimulationSimulateParams = {
 export type SimulateWithdrawMAEntity = {
     socketWithdrawFees: SocketWithdrawFees;
     bridgeTimeInMS: number;
-    marginRatio: MarginAccountEntity['marginRatioPercentage'];
-    marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+    marginRatio: number;
+    marginRatioHealth: MarginRatioHealth;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/clients/modules/withdraw-MA.simulation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/withdraw-MA.simulation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sCAAsC,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,kCAAkC,GAC5C,sCAAsC,CAAC;AAEzC,MAAM,MAAM,kCAAkC,GAAG;IAC/C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAC1D,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;CAC7D,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/withdraw-MA.simulation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sCAAsC,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,kCAAkC,GAC5C,sCAAsC,CAAC;AAEzC,MAAM,MAAM,kCAAkC,GAAG;IAC/C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC"}

package/dist/types/clients/socket-client.d.ts

@@ -100,7 +100,7 @@ export declare class SocketClient {
      *
      */
     set onMessage(callback: (event: SocketMessage) => void);
-    getReadyState(): 0 | 2 | 1 | 3 | undefined;
+    getReadyState(): 0 | 1 | 2 | 3 | undefined;
     /**
      * @description Send a subscribe message to the websocket connection.
      *

package/dist/types/clients/types.d.ts

@@ -1,10 +1,9 @@
-export { Candle, CandlesResolution, MarketEntity, LpTransactionHistoryEntity, TradingHistoryEntity, OrderHistoryEntity, PositionEntity, TransactionHistoryType, MarginAccountTransactionHistoryType, MarginAccountTransactionHistoryEntity, MarginAccountEntity, LpPositionEntity, LpPoolEntity, ReyaChainId, MoneyInOutChainId, LpBalanceGranularity, MarginAccountBalanceGranularity, GetMarginAccountBalanceChartDataResult, MarginAccountCollateralsBalanceGranularity, GetMarginAccountCollateralsBalanceChartDataResult, GetAllMarginAccountsBalanceChartDataResult, AllMarginAccountsBalanceGranularity, GetFundingRateChartDataResult, FundingRateHistoryGranularity, MoneyInOutConfigurationPerTokenName, UnifiedConditionalOrderType, ConditionalOrderType, } from '@reyaxyz/common';
+export { Candle, CandlesResolution, MarketEntity, LpTransactionHistoryEntity, TradingHistoryEntity, OrderHistoryEntity, PositionEntity, TransactionHistoryType, MarginAccountTransactionHistoryType, MarginAccountTransactionHistoryEntity, StrippedMarginAccountEntity, LpPositionEntity, LpPoolEntity, ReyaChainId, MoneyInOutChainId, LpBalanceGranularity, MarginAccountBalanceGranularity, GetMarginAccountBalanceChartDataResult, MarginAccountCollateralsBalanceGranularity, GetMarginAccountCollateralsBalanceChartDataResult, GetAllMarginAccountsBalanceChartDataResult, AllMarginAccountsBalanceGranularity, GetFundingRateChartDataResult, FundingRateHistoryGranularity, MoneyInOutConfigurationPerTokenName, UnifiedConditionalOrderType, ConditionalOrderType, } from '@reyaxyz/common';
 export * from './modules/account/types';
 export * from './modules/conditional-orders/types';
 export * from './modules/lp/types';
 export * from './modules/markets/types';
 export * from './modules/tokens/types';
-export * from './modules/trade.simulation/types';
 export * from './modules/owner/types';
 export * from './modules/deposit-existing-MA.simulation/types';
 export * from './modules/deposit-new-MA.simulation/types';
@@ -17,6 +16,4 @@ export * from './modules/transfer-MA-Pool.simulation/types';
 export * from './modules/funding-rate/types';
 export * from './modules/depth-chart.simulation/types';
 export * from './modules/deposit-passive-pool.simulation/types';
-export * from './modules/isolated-order.simulation/types';
-export * from './modules/rage-trade/types';
 //# sourceMappingURL=types.d.ts.map

package/dist/types/clients/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/types.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,mCAAmC,EACnC,qCAAqC,EACrC,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,+BAA+B,EAC/B,sCAAsC,EACtC,0CAA0C,EAC1C,iDAAiD,EACjD,0CAA0C,EAC1C,mCAAmC,EACnC,6BAA6B,EAC7B,6BAA6B,EAC7B,mCAAmC,EACnC,2BAA2B,EAC3B,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,kDAAkD,CAAC;AACjE,cAAc,wDAAwD,CAAC;AACvE,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/types.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,mCAAmC,EACnC,qCAAqC,EACrC,2BAA2B,EAC3B,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,+BAA+B,EAC/B,sCAAsC,EACtC,0CAA0C,EAC1C,iDAAiD,EACjD,0CAA0C,EAC1C,mCAAmC,EACnC,6BAA6B,EAC7B,6BAA6B,EAC7B,mCAAmC,EACnC,2BAA2B,EAC3B,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,kDAAkD,CAAC;AACjE,cAAc,wDAAwD,CAAC;AACvE,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/api-sdk",
-  "version": "0.157.0",
+  "version": "0.159.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -33,15 +33,15 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.311.0",
+    "@reyaxyz/common": "0.312.0",
     "@simplewebauthn/types": "10.0.0",
     "bignumber.js": "9.1.2",
     "ethers": "6.9.0",
     "isomorphic-ws": "5.0.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "820bf1d931672522440894ba3b13568bc7ea753e",
+  "gitHead": "9466fb19baa2841b90d1d99f5eb4ca44bf457e73",
   "devDependencies": {
-    "@reyaxyz/database": "0.149.6"
+    "@reyaxyz/database": "0.149.7"
   }
 }

package/src/clients/api-client.ts

@@ -5,7 +5,6 @@ import {
 } from '@reyaxyz/common';
 import MarketsClient from './modules/markets';
 import AccountClient from './modules/account';
-import TradeSimulationClient from './modules/trade.simulation';
 import LpClient from './modules/lp';
 import TokensClient from './modules/tokens';
 import OwnerClient from './modules/owner';
@@ -19,11 +18,9 @@ import TransferMarginBetweenMAsSimulationClient from './modules/transfer-margin-
 import TransferMAPoolSimulationClient from './modules/transfer-MA-Pool.simulation';
 import DepthChartSimulationClient from './modules/depth-chart.simulation';
 import FundingRateClient from './modules/funding-rate';
-import IsolatedOrderSimulationClient from './modules/isolated-order.simulation';
 import ConditionalOrdersClient from './modules/conditional-orders';
 import ReferralClient from './modules/referral';
 import AuthClient from './modules/auth';
-import RageTradeClient from './modules/rage-trade';
 
 /**
  * @description Client for API
@@ -34,7 +31,6 @@ export class ApiClient {
   private readonly _markets: MarketsClient;
   private readonly _account: AccountClient;
   private readonly _lp: LpClient;
-  private readonly _tradeSimulation: TradeSimulationClient;
   private readonly _fundingRateHistory: FundingRateClient;
   private readonly _editCollateralSimulation: EditCollateralSimulationClient;
   private readonly _depositExistingMASimulation: DepositExistingMASimulationClient;
@@ -45,22 +41,16 @@ export class ApiClient {
   private readonly _transferMarginBetweenMAsSimulation: TransferMarginBetweenMAsSimulationClient;
   private readonly _transferMAPoolSimulation: TransferMAPoolSimulationClient;
   private readonly _depthSimulation: DepthChartSimulationClient;
-  private readonly _isolatedOrderSimulation: IsolatedOrderSimulationClient;
   private readonly _tokens: TokensClient;
   private readonly _owner: OwnerClient;
   private readonly _conditionalOrders: ConditionalOrdersClient;
   private readonly _referral: ReferralClient;
-  private readonly _rageTrade: RageTradeClient;
   private readonly _auth: AuthClient;
 
   private constructor() {
     this._markets = new MarketsClient(ApiClient.config.apiEndpoint);
     this._account = new AccountClient(ApiClient.config.apiEndpoint);
     this._lp = new LpClient(ApiClient.config.apiEndpoint);
-    this._tradeSimulation = new TradeSimulationClient(this._account);
-    this._isolatedOrderSimulation = new IsolatedOrderSimulationClient(
-      this._account,
-    );
     this._fundingRateHistory = new FundingRateClient(this._markets);
     this._editCollateralSimulation = new EditCollateralSimulationClient(
       ApiClient.network,
@@ -103,7 +93,6 @@ export class ApiClient {
       ApiClient.config.apiEndpoint,
     );
     this._referral = new ReferralClient(ApiClient.config.apiEndpoint);
-    this._rageTrade = new RageTradeClient(ApiClient.config.apiEndpoint);
     this._auth = new AuthClient(ApiClient.config.apiEndpoint);
   }
 
@@ -149,41 +138,6 @@ export class ApiClient {
     return ApiClient.getInstance()._account;
   }
 
-  /**
-   * Provides access to the TradeSimulationClient instance.
-   * This getter allows for interacting with trade simulation functionalities.
-   * It ensures a singleton pattern by fetching the instance from the ApiClient's
-   * private `_tradeSimulation` property, ensuring that trade simulation operations
-   * use a consistent client configuration and state.
-   *
-   * @returns {TradeSimulationClient} An instance of TradeSimulationClient for trade simulation operations.
-   * @memberof ApiClient
-   * @example
-   * // Access the trade simulation client from the ApiClient
-   * const tradeSimulationClient = ApiClient.tradeSimulation;
-   */
-
-  public static get tradeSimulation(): TradeSimulationClient {
-    return ApiClient.getInstance()._tradeSimulation;
-  }
-
-  /**
-   * Provides access to the IsolatedOrderSimulationClient instance.
-   * This getter allows for interacting with isolatedTrade simulation functionalities.
-   * It ensures a singleton pattern by fetching the instance from the ApiClient's
-   * private `_isolatedTradeSimulation` property, ensuring that isolatedTrade simulation operations
-   * use a consistent client configuration and state.
-   *
-   * @returns {IsolatedOrderSimulationClient} An instance of IsolatedOrderSimulationClient for isolatedTrade simulation operations.
-   * @memberof ApiClient
-   * @example
-   * // Access the isolatedTrade simulation client from the ApiClient
-   * const isolatedTradeSimulationClient = ApiClient.isolatedTradeSimulation;
-   */
-  public static get isolatedSimulation(): IsolatedOrderSimulationClient {
-    return ApiClient.getInstance()._isolatedOrderSimulation;
-  }
-
   public static get fundingRateHistory(): FundingRateClient {
     return ApiClient.getInstance()._fundingRateHistory;
   }
@@ -407,18 +361,6 @@ export class ApiClient {
     return ApiClient.getInstance()._referral;
   }
 
-  /**
-   * Gets the current instance of the RageTradeClient from the ApiClient.
-   *
-   * This static getter allows access to the RageTradeClient instance managed within the ApiClient's singleton instance. It is a convenience method for retrieving the RageTradeClient directly, bypassing the need to manually access the internal `_rageTrade` property of the ApiClient instance.
-   *
-   * @returns {RageTradeClient} The RageTradeClient instance currently held by the ApiClient.
-   */
-
-  public static get rageTrade(): RageTradeClient {
-    return ApiClient.getInstance()._rageTrade;
-  }
-
   /**
    * Gets the current instance of the AuthClient from the ApiClient.
    *

package/src/clients/modules/account/index.ts

@@ -5,25 +5,13 @@ import {
   GetMarginAccountsResult,
   GetMarginAccountTransactionHistoryParams,
   GetMarginAccountTransactionHistoryResult,
-  GetMaxOrderSizeAvailableParams,
-  GetMaxOrderSizeAvailableResult,
   GetMaxWithdrawBalanceForAccountParams,
   GetMaxWithdrawBalanceForAccountResult,
-  GetPositionsForMarginAccountParams,
-  GetPositionsForMarginAccountResult,
-  GetTransactionSimulationInitialDataParams,
-  GetMarginAccountBalanceChartDataParams,
-  GetMarginAccountCollateralsBalanceChartDataParams,
-  GetAllMarginAccountsBalanceChartDataParams,
   EditMarginAccountParams,
   CloseMarginAccountParams,
-  GetAllMarginAccountsSummaryResult,
-  GetAllMarginAccountsSummaryParams,
   GetEditCollateralSimulationInitialDataParams,
   EditMarginAccountResult,
   CloseMarginAccountResult,
-  GetIsolatedOrderMaxSizeAvailableParams,
-  GetIsolatedOrderMaxSizeAvailableResult,
   GetMarginAccountOrderHistoryPaginatedParams,
   GetMarginAccountOrderHistoryPaginatedResult,
   GetLiquidationHistoryForOwnerAddressResult,
@@ -37,11 +25,8 @@ import {
 } from './types';
 import {
   EditCollateralSimulationState,
-  TradeSimulationState,
-  GetMarginAccountCollateralsBalanceChartDataResult,
-  GetMarginAccountBalanceChartDataResult,
-  GetAllMarginAccountsBalanceChartDataResult,
   RestClient,
+  StrippedMarginAccountEntity,
 } from '@reyaxyz/common';
 
 export default class AccountClient extends RestClient {
@@ -67,7 +52,24 @@ export default class AccountClient extends RestClient {
       includePositions: false,
     });
 
-    return response;
+    const strippedResponse = response.map(
+      (account): StrippedMarginAccountEntity => {
+        return {
+          id: account.id,
+          name: account.name,
+          marginRatioHealth: account.marginRatioHealth,
+          marginRatioPercentage: account.marginRatioPercentage,
+          marginRatioHealthDangerThreshold:
+            account.marginRatioHealthDangerThreshold,
+          marginRatioHealthWarningThreshold:
+            account.marginRatioHealthWarningThreshold,
+          isApproachingLiquidation: account.isApproachingLiquidation,
+          isLiquidationImminent: account.isLiquidationImminent,
+        };
+      },
+    );
+
+    return strippedResponse;
   }
 
   /**
@@ -86,14 +88,22 @@ export default class AccountClient extends RestClient {
     params: GetMarginAccountParams,
   ): Promise<GetMarginAccountResult> {
     const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}`;
-    return this.get(uri);
-  }
+    const response: GetMarginAccountResult = await this.get(uri);
 
-  async getPositionsForMarginAccount(
-    params: GetPositionsForMarginAccountParams,
-  ): Promise<GetPositionsForMarginAccountResult> {
-    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}/positions`;
-    return this.get(uri, { limit: params.limit });
+    const strippedResponse = {
+      id: response.id,
+      name: response.name,
+      marginRatioHealth: response.marginRatioHealth,
+      marginRatioPercentage: response.marginRatioPercentage,
+      marginRatioHealthDangerThreshold:
+        response.marginRatioHealthDangerThreshold,
+      marginRatioHealthWarningThreshold:
+        response.marginRatioHealthWarningThreshold,
+      isApproachingLiquidation: response.isApproachingLiquidation,
+      isLiquidationImminent: response.isLiquidationImminent,
+    };
+
+    return strippedResponse;
   }
 
   async getMarginAccountOrderHistoryPaginated(
@@ -125,35 +135,6 @@ export default class AccountClient extends RestClient {
     });
   }
 
-  async getMaxOrderSizeAvailable(
-    params: GetMaxOrderSizeAvailableParams,
-  ): Promise<GetMaxOrderSizeAvailableResult> {
-    const uri = `/api/accounts/${params.marginAccountId}/max-order-size`;
-    return this.get(uri, {
-      marketId: params.marketId,
-      direction: params.direction,
-    });
-  }
-
-  async getIsolatedOrderMaxSizeAvailable(
-    params: GetIsolatedOrderMaxSizeAvailableParams,
-  ): Promise<GetIsolatedOrderMaxSizeAvailableResult> {
-    const uri = `/api/accounts/${params.marginAccountId}/max-order-size-isolated`;
-    return this.get(uri, {
-      marketId: params.marketId,
-      direction: params.direction,
-    });
-  }
-
-  async getTransactionSimulationInitialData(
-    params: GetTransactionSimulationInitialDataParams,
-  ): Promise<TradeSimulationState> {
-    const uri = `/api/accounts/${params.marginAccountId}/trade-simulation-data`;
-    return this.get(uri, {
-      marketId: params.marketId,
-    });
-  }
-
   async getEditCollateralSimulationInitialData(
     params: GetEditCollateralSimulationInitialDataParams,
   ): Promise<EditCollateralSimulationState> {
@@ -188,43 +169,6 @@ export default class AccountClient extends RestClient {
     });
   }
 
-  async getMarginAccountBalanceChartData(
-    params: GetMarginAccountBalanceChartDataParams,
-  ): Promise<GetMarginAccountBalanceChartDataResult> {
-    const uri = `/api/accounts/${params.marginAccountId}/balance-chart-data`;
-    return this.get(uri, {
-      timeframeMs: params.filters.timeframeMs,
-      granularity: params.filters.granularity,
-    });
-  }
-
-  async getMarginAccountCollateralsBalanceChartData(
-    params: GetMarginAccountCollateralsBalanceChartDataParams,
-  ): Promise<GetMarginAccountCollateralsBalanceChartDataResult> {
-    const uri = `/api/accounts/${params.marginAccountId}/collaterals-balance-chart-data`;
-    return this.get(uri, {
-      timeframeMs: params.filters.timeframeMs,
-      granularity: params.filters.granularity,
-    });
-  }
-
-  async getAllMarginAccountsBalanceChart(
-    params: GetAllMarginAccountsBalanceChartDataParams,
-  ): Promise<GetAllMarginAccountsBalanceChartDataResult> {
-    const uri = `/api/accounts/owner/${params.ownerAddress}/balance`;
-    return this.get(uri, {
-      timeframeMs: params.filters.timeframeMs,
-      granularity: params.filters.granularity,
-    });
-  }
-
-  async getAllMarginAccountsSummary(
-    params: GetAllMarginAccountsSummaryParams,
-  ): Promise<GetAllMarginAccountsSummaryResult> {
-    const uri = `/api/accounts/owner/${params.ownerAddress}/summary`;
-    return this.get(uri);
-  }
-
   // TODO: Milan validate
   async editMarginAccount(
     params: EditMarginAccountParams,

package/src/clients/modules/account/types.ts

@@ -1,9 +1,10 @@
 import {
-  MarginAccountEntity,
   MarginAccountTransactionHistoryEntity,
   MarketEntity,
   PositionEntity,
   OrderHistoryEntity,
+  MarginRatioHealth,
+  StrippedMarginAccountEntity,
 } from '@reyaxyz/common';
 import {
   MarginAccountBalanceGranularity,
@@ -21,22 +22,22 @@ export type GetMarginAccountsParams = {
 
 export type GetMarginAccountParams = {
   address: string;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
 };
 
 export type GetPositionsForMarginAccountParams = {
   address: string;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   limit?: number;
 };
 
-export type GetMarginAccountsResult = MarginAccountEntity[];
+export type GetMarginAccountsResult = StrippedMarginAccountEntity[];
 
-export type GetMarginAccountResult = MarginAccountEntity;
+export type GetMarginAccountResult = StrippedMarginAccountEntity;
 
 // ---- Transaction History
 export type GetMarginAccountTransactionHistoryParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   limit?: number;
 };
 
@@ -44,7 +45,7 @@ export type GetMarginAccountTransactionHistoryResult =
   MarginAccountTransactionHistoryEntity[];
 
 export type GetAccountFeeRebatesHistoryParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   limit?: number;
 };
 
@@ -55,7 +56,7 @@ export type GetAccountFeeRebatesHistoryResult = {
 
 export type GetMaxOrderSizeAvailableParams = {
   marketId: MarketEntity['id'];
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   direction: 'long' | 'short';
 };
 
@@ -66,7 +67,7 @@ export type GetMaxOrderSizeAvailableResult = {
 
 // --- Max Withdraw Balance for Margin Account ---
 export type GetMaxWithdrawBalanceForAccountParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   tokenAddress: string;
 };
 
@@ -81,12 +82,12 @@ export type GetPositionsForMarginAccountResult = {
 
 export type GetMarginAccountOrderHistoryParams = {
   address: string;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   limit?: number;
 };
 export type GetMarginAccountOrderHistoryPaginatedParams = {
   address: string;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   page: number;
   perPage: number;
   type?: 'order' | 'liquidation';
@@ -116,10 +117,10 @@ export type LiquidationHistoryEntity = {
   timestamp: number;
   baseUnderlyingToken: string;
   marginAccount: {
-    id: MarginAccountEntity['id'];
-    name: MarginAccountEntity['name'];
-    marginRatioPercentage: MarginAccountEntity['marginRatioPercentage'];
-    marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+    id: number;
+    name: string;
+    marginRatioPercentage: number;
+    marginRatioHealth: MarginRatioHealth;
   };
 };
 
@@ -133,17 +134,17 @@ export type GetAutoExchangeHistoryForOwnerAddressResult = {
 
 export type GetTransactionSimulationInitialDataParams = {
   marketId: MarketEntity['id'];
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
 };
 
 // ---- Edit Collateral Simulation ----
 
 export type GetEditCollateralSimulationInitialDataParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
 };
 
 export type GetMarginAccountBalanceChartDataParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   filters: {
     timeframeMs: number;
     granularity: MarginAccountBalanceGranularity;
@@ -151,7 +152,7 @@ export type GetMarginAccountBalanceChartDataParams = {
 };
 
 export type GetMarginAccountCollateralsBalanceChartDataParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   filters: {
     timeframeMs: number;
     granularity: MarginAccountCollateralsBalanceGranularity;
@@ -167,14 +168,14 @@ export type GetAllMarginAccountsBalanceChartDataParams = {
 };
 
 export type EditMarginAccountParams = {
-  id: MarginAccountEntity['id'];
-  name: MarginAccountEntity['name'];
+  id: number;
+  name: string;
 };
 
 export type EditMarginAccountResult = { success: boolean };
 
 export type CloseMarginAccountParams = {
-  id: MarginAccountEntity['id'];
+  id: number;
 };
 
 export type CloseMarginAccountResult = { success: boolean };
@@ -192,7 +193,7 @@ export type GetAllMarginAccountsSummaryResult = {
 
 export type GetIsolatedOrderMaxSizeAvailableParams = {
   marketId: MarketEntity['id'];
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   direction: 'long' | 'short';
 };
 
@@ -202,7 +203,7 @@ export type GetIsolatedOrderMaxSizeAvailableResult = {
 };
 
 export type UpdateLeverageForAccountAndMarketParams = {
-  accountId: MarginAccountEntity['id'];
+  accountId: number;
   marketId: MarketEntity['id'];
   leverage: number;
 };

package/src/clients/modules/auth/types.ts

@@ -1,9 +1,8 @@
 import { JsonRpcSigner, Signer } from 'ethers';
-import { MarginAccountEntity } from '@reyaxyz/common';
 import { RegistrationResponseJSON } from '@simplewebauthn/types';
 
 export type RegisterParams = {
   signer: Signer | JsonRpcSigner;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   attestationResponse: RegistrationResponseJSON;
 };

package/src/clients/modules/conditional-orders/types.ts

@@ -4,7 +4,7 @@ import {
   ConditionalOrderType,
 } from '@reyaxyz/common';
 import { Signer, JsonRpcSigner } from 'ethers';
-import { MarginAccountEntity, MarketEntity, Address } from '@reyaxyz/common';
+import { MarketEntity, Address } from '@reyaxyz/common';
 
 export type CancelConditionalOrderParams = {
   signer: Signer | JsonRpcSigner;
@@ -31,7 +31,7 @@ export type OrderSupportingParams = {
 
 export type RegisterConditionalOrderParams = {
   signer: Signer | JsonRpcSigner;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   triggerPrice: number;
   orderType: ConditionalOrderType;
   marketId: number;
@@ -66,7 +66,7 @@ export type AlreadyGaveTradePermissionToWalletResult = {
 // ---- Conditional Orders History ---
 export type GetConditionalOrdersHistoryForMarginAccountParams = {
   address: string;
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
   limit?: number;
 };
 

package/src/clients/modules/deposit-existing-MA.simulation/types.ts

@@ -1,5 +1,5 @@
 import {
-  MarginAccountEntity,
+  MarginRatioHealth,
   MoneyInOutChainId,
   SocketDepositFees,
   TokenEntity,
@@ -18,6 +18,6 @@ export type DepositExistingMASimulationSimulateParams = {
 export type SimulateDepositExistingMAEntity = {
   socketDepositFees: SocketDepositFees;
   bridgeTimeInMS: number;
-  marginRatio: MarginAccountEntity['marginRatioPercentage'];
-  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+  marginRatio: number;
+  marginRatioHealth: MarginRatioHealth;
 };

package/src/clients/modules/edit-collateral.simulation/types.ts

@@ -1,7 +1,7 @@
-import { MarginAccountEntity, TokenEntity } from '@reyaxyz/common';
+import { MarginRatioHealth, TokenEntity } from '@reyaxyz/common';
 
 export type EditCollateralSimulationLoadDataParams = {
-  marginAccountId: MarginAccountEntity['id'];
+  marginAccountId: number;
 };
 
 export type EditCollateralSimulationSimulateParams = {
@@ -10,6 +10,6 @@ export type EditCollateralSimulationSimulateParams = {
 };
 
 export type SimulateEditCollateralEntity = {
-  marginRatio: MarginAccountEntity['marginRatioPercentage'];
-  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+  marginRatio: number;
+  marginRatioHealth: MarginRatioHealth;
 };

package/src/clients/modules/markets/index.ts

@@ -5,15 +5,10 @@ import {
   GetMarketResult,
   GetMarketsResult,
   GetMarketTradingHistoryParams,
-  GetPoolPriceResult,
   GetTradingHistoryResult,
   MarketCandlesResponse,
 } from './types';
-import {
-  GetFundingRateChartDataResult,
-  RestClient,
-  GetInstantPoolPriceResult,
-} from '@reyaxyz/common';
+import { GetFundingRateChartDataResult, RestClient } from '@reyaxyz/common';
 
 export default class MarketsClient extends RestClient {
   /**
@@ -44,12 +39,6 @@ export default class MarketsClient extends RestClient {
     return this.get(uri);
   }
 
-  async getPoolPrice(params: GetMarketParams): Promise<GetPoolPriceResult> {
-    const uri = `/api/markets/${params.id}/pool-price/`;
-    const poolPriceInfo: GetInstantPoolPriceResult = await this.get(uri);
-    return { price: poolPriceInfo.poolPrice };
-  }
-
   /**
    * Retrieves candlestick data for a specified market.
    *