@reyaxyz/api-sdk 0.143.1 → 0.144.0

package/dist/clients/socket-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket-client.js","sourceRoot":"/","sources":["clients/socket-client.ts"],"names":[],"mappings":"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","sourcesContent":["import WebSocket, { MessageEvent } from 'isomorphic-ws';\n\nimport {\n  API_CLIENT_CONFIGS,\n  Candle,\n  CandlesResolution,\n  MarketEntity,\n  ServiceConfig,\n  StorkSignedPayload,\n} from '@reyaxyz/common';\n\nenum OutgoingMessageTypes {\n  PING = 'ping',\n  SUBSCRIBE = 'subscribe',\n  UNSUBSCRIBE = 'unsubscribe',\n}\n\nexport enum SocketChannels {\n  CANDLES = 'candles',\n  PRICES = 'prices',\n  FUNDING_RATES = 'funding-rates',\n  MARKETS_UPDATES = 'markets-updates',\n}\n\nexport enum IncomingMessageTypes {\n  CONNECTED = 'connected',\n  SUBSCRIBED = 'subscribed',\n  ERROR = 'error',\n  CHANNEL_DATA = 'channel_data',\n  CHANNEL_BATCH_DATA = 'channel_batch_data',\n  PONG = 'pong',\n}\nexport enum OutgoingMessageType {\n  ERROR = 'error',\n  CONNECTED = 'connected',\n  SUBSCRIBED = 'subscribed',\n  UNSUBSCRIBED = 'unsubscribed',\n  CHANNEL_DATA = 'channel_data',\n  CHANNEL_BATCH_DATA = 'channel_batch_data',\n  PONG = 'pong',\n}\nexport interface OutgoingMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n}\nexport interface SocketMessage {\n  message_id: number;\n  connection_id: string;\n  type: OutgoingMessageType;\n  channel?: SocketChannels;\n  contents?: unknown;\n  id?: string;\n}\n\nexport interface CandleMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.CANDLES;\n  id: string;\n  contents: {\n    candles: Candle[];\n  };\n}\n\nexport interface PricesMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.PRICES;\n  id: string;\n  contents: {\n    signedPrice: StorkSignedPayload;\n    poolPrice: string;\n    spotPrice: string;\n    marketId: number | null;\n    assetPairId: string;\n  };\n}\n\nexport interface MarketsUpdateMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.MARKETS_UPDATES;\n  id: string;\n  contents: MarketEntity[];\n}\n\nexport interface FundingRateMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.FUNDING_RATES;\n  id: string;\n  contents: { timestamp: number; value: string; assetsPair: string };\n}\n\nexport interface SocketClientConfig {\n  environment: ServiceConfig['environment'];\n  onOpen: () => void;\n  onClose: () => void;\n  onMessage: (event: SocketMessage) => void;\n}\n\nexport class SocketClient {\n  private url: string;\n  private ws?: WebSocket;\n  private onOpenCallback?: () => void;\n  private onCloseCallback?: () => void;\n  private onMessageCallback?: (event: SocketMessage) => void;\n  private pingInterval: number = 30_000;\n  private lastMessageTime: number = Date.now();\n  private pingIntervalId?: NodeJS.Timeout;\n  constructor(config: SocketClientConfig) {\n    this.onOpenCallback = config.onOpen;\n    this.onCloseCallback = config.onClose;\n    this.onMessageCallback = config.onMessage;\n    this.url = (\n      API_CLIENT_CONFIGS[config.environment] || API_CLIENT_CONFIGS['test']\n    ).webSocketEndpoint;\n  }\n\n  connect(): void {\n    this.ws = new WebSocket(this.url);\n    this.ws.addEventListener('open', this.handleOpen.bind(this));\n    this.ws.addEventListener('close', this.handleClose.bind(this));\n    this.ws.addEventListener('message', this.handleMessage.bind(this));\n  }\n\n  /**\n   * @description Close the websocket connection.\n   *\n   */\n  close(): void {\n    this.ws?.close();\n    this.ws = undefined;\n  }\n\n  /**\n   * @description Send data to the websocket connection.\n   *\n   */\n  send(data: string): void {\n    this.ws?.send(data);\n  }\n\n  private handleOpen(): void {\n    if (this.onOpenCallback) {\n      this.onOpenCallback();\n    }\n    this.restartPingInterval();\n  }\n\n  private handleClose(): void {\n    if (this.onCloseCallback) {\n      this.onCloseCallback();\n    }\n    clearInterval(this.pingIntervalId);\n  }\n\n  private handleMessage(event: MessageEvent): void {\n    if (event.data === 'PING') {\n      this.send('PONG');\n    } else {\n      this.lastMessageTime = Date.now();\n      try {\n        const parsedMessage: SocketMessage = JSON.parse(event.data as string);\n        if (typeof this.onMessageCallback === 'function') {\n          this.onMessageCallback(parsedMessage);\n        }\n      } catch (error) {\n        console.error('Error parsing message', error);\n      }\n    }\n    this.restartPingInterval();\n  }\n\n  private restartPingInterval(): void {\n    clearInterval(this.pingIntervalId);\n    this.pingIntervalId = setInterval(() => {\n      const elapsedTime = Date.now() - this.lastMessageTime;\n      if (elapsedTime > this.pingInterval) {\n        const message = {\n          type: OutgoingMessageTypes.PING,\n        };\n        this.send(JSON.stringify(message));\n      }\n    }, this.pingInterval);\n  }\n\n  /**\n   * @description Set callback when the socket is opened.\n   *\n   */\n  set onOpen(callback: () => void) {\n    this.onOpenCallback = callback;\n  }\n\n  /**\n   * @description Set callback when the socket is closed.\n   *\n   */\n  set onClose(callback: () => void) {\n    this.onCloseCallback = callback;\n  }\n\n  /**\n   * @description Set callback when the socket receives a message.\n   *\n   */\n  set onMessage(callback: (event: SocketMessage) => void) {\n    this.onMessageCallback = callback;\n  }\n\n  getReadyState() {\n    return this.ws?.readyState;\n  }\n\n  /**\n   * @description Send a subscribe message to the websocket connection.\n   *\n   */\n  subscribe(channel: string, params?: object): void {\n    const message = {\n      type: OutgoingMessageTypes.SUBSCRIBE,\n      channel,\n      ...params,\n    };\n    this.send(JSON.stringify(message));\n  }\n\n  /**\n   * @description Send an unsubscribe message to the websocket connection.\n   *\n   */\n  unsubscribe(channel: string, params?: object): void {\n    const message = {\n      type: OutgoingMessageTypes.UNSUBSCRIBE,\n      channel,\n      ...params,\n    };\n    this.send(JSON.stringify(message));\n  }\n  /**\n   * @description Subscribe to candles channel\n   * for a specific market and resolution.\n   *\n   */\n  subscribeToCandles(\n    marketTicker: string,\n    resolution: CandlesResolution,\n  ): void {\n    const channel = SocketChannels.CANDLES;\n    const params = {\n      id: `${marketTicker}/${resolution}`,\n      batched: true,\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from candles channel\n   * for a specific market and resolution.\n   */\n  unsubscribeFromCandles(market: string, resolution: CandlesResolution): void {\n    const channel = SocketChannels.CANDLES;\n    const params = {\n      id: `${market}/${resolution}`,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  /**\n   * @description Subscribe to prices channel\n   * for a specific assets pair.\n   *\n   */\n  subscribeToPrices(assetsPair: string): void {\n    const channel = SocketChannels.PRICES;\n    const params = {\n      id: assetsPair,\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from prices channel\n   * for a specific market and resolution.\n   */\n  unsubscribeFromPrices(assetsPair: string): void {\n    const channel = SocketChannels.PRICES;\n    const params = {\n      id: assetsPair,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  /**\n   * @description Subscribe to funding rate channel\n   * for a specific assets pair.\n   *\n   */\n  subscribeToFundingRate(assetsPair: string): void {\n    const channel = SocketChannels.FUNDING_RATES;\n    const params = {\n      id: assetsPair,\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from funding rate channel\n   * for a specific market and resolution.\n   */\n  unsubscribeFromFundingRate(assetsPair: string): void {\n    const channel = SocketChannels.FUNDING_RATES;\n    const params = {\n      id: assetsPair,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  /**\n   * @description Subscribe to markets updates channel\n   *\n   */\n  subscribeToMarketsUpdates(): void {\n    const channel = SocketChannels.MARKETS_UPDATES;\n    const params = {\n      id: '1',\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from markets updates channel\n   */\n  unsubscribeFromMarketsUpdates(): void {\n    const channel = SocketChannels.MARKETS_UPDATES;\n    const params = {\n      id: '1',\n    };\n    this.unsubscribe(channel, params);\n  }\n}\n"]}
+{"version":3,"file":"socket-client.js","sourceRoot":"/","sources":["clients/socket-client.ts"],"names":[],"mappings":"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","sourcesContent":["import WebSocket, { MessageEvent } from 'isomorphic-ws';\n\nimport {\n  API_CLIENT_CONFIGS,\n  Candle,\n  CandlesResolution,\n  MarketEntity,\n  ServiceConfig,\n  StorkSignedPayload,\n} from '@reyaxyz/common';\n\nenum OutgoingMessageTypes {\n  PING = 'ping',\n  SUBSCRIBE = 'subscribe',\n  UNSUBSCRIBE = 'unsubscribe',\n}\n\nexport enum SocketChannels {\n  CANDLES = 'candles',\n  PRICES = 'prices',\n  FUNDING_RATES = 'funding-rates',\n  MARKETS_UPDATES = 'markets-updates',\n  SPOT_CANDLES = 'spot-candles',\n}\n\nexport enum IncomingMessageTypes {\n  CONNECTED = 'connected',\n  SUBSCRIBED = 'subscribed',\n  ERROR = 'error',\n  CHANNEL_DATA = 'channel_data',\n  CHANNEL_BATCH_DATA = 'channel_batch_data',\n  PONG = 'pong',\n}\nexport enum OutgoingMessageType {\n  ERROR = 'error',\n  CONNECTED = 'connected',\n  SUBSCRIBED = 'subscribed',\n  UNSUBSCRIBED = 'unsubscribed',\n  CHANNEL_DATA = 'channel_data',\n  CHANNEL_BATCH_DATA = 'channel_batch_data',\n  PONG = 'pong',\n}\nexport interface OutgoingMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n}\nexport interface SocketMessage {\n  message_id: number;\n  connection_id: string;\n  type: OutgoingMessageType;\n  channel?: SocketChannels;\n  contents?: unknown;\n  id?: string;\n}\n\nexport interface CandleMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.CANDLES;\n  id: string;\n  contents: {\n    candles: Candle[];\n  };\n}\n\nexport interface PricesMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.PRICES;\n  id: string;\n  contents: {\n    signedPrice: StorkSignedPayload;\n    poolPrice: string;\n    spotPrice: string;\n    marketId: number | null;\n    assetPairId: string;\n  };\n}\n\nexport interface MarketsUpdateMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.MARKETS_UPDATES;\n  id: string;\n  contents: MarketEntity[];\n}\n\nexport interface FundingRateMessage extends SocketMessage {\n  type: OutgoingMessageType;\n  connection_id: string;\n  message_id: number;\n  channel: SocketChannels.FUNDING_RATES;\n  id: string;\n  contents: { timestamp: number; value: string; assetsPair: string };\n}\n\nexport interface SocketClientConfig {\n  environment: ServiceConfig['environment'];\n  onOpen: () => void;\n  onClose: () => void;\n  onMessage: (event: SocketMessage) => void;\n}\n\nexport class SocketClient {\n  private url: string;\n  private ws?: WebSocket;\n  private onOpenCallback?: () => void;\n  private onCloseCallback?: () => void;\n  private onMessageCallback?: (event: SocketMessage) => void;\n  private pingInterval: number = 30_000;\n  private lastMessageTime: number = Date.now();\n  private pingIntervalId?: NodeJS.Timeout;\n  constructor(config: SocketClientConfig) {\n    this.onOpenCallback = config.onOpen;\n    this.onCloseCallback = config.onClose;\n    this.onMessageCallback = config.onMessage;\n    this.url = (\n      API_CLIENT_CONFIGS[config.environment] || API_CLIENT_CONFIGS['test']\n    ).webSocketEndpoint;\n  }\n\n  connect(): void {\n    this.ws = new WebSocket(this.url);\n    this.ws.addEventListener('open', this.handleOpen.bind(this));\n    this.ws.addEventListener('close', this.handleClose.bind(this));\n    this.ws.addEventListener('message', this.handleMessage.bind(this));\n  }\n\n  /**\n   * @description Close the websocket connection.\n   *\n   */\n  close(): void {\n    this.ws?.close();\n    this.ws = undefined;\n  }\n\n  /**\n   * @description Send data to the websocket connection.\n   *\n   */\n  send(data: string): void {\n    this.ws?.send(data);\n  }\n\n  private handleOpen(): void {\n    if (this.onOpenCallback) {\n      this.onOpenCallback();\n    }\n    this.restartPingInterval();\n  }\n\n  private handleClose(): void {\n    if (this.onCloseCallback) {\n      this.onCloseCallback();\n    }\n    clearInterval(this.pingIntervalId);\n  }\n\n  private handleMessage(event: MessageEvent): void {\n    if (event.data === 'PING') {\n      this.send('PONG');\n    } else {\n      this.lastMessageTime = Date.now();\n      try {\n        const parsedMessage: SocketMessage = JSON.parse(event.data as string);\n        if (typeof this.onMessageCallback === 'function') {\n          this.onMessageCallback(parsedMessage);\n        }\n      } catch (error) {\n        console.error('Error parsing message', error);\n      }\n    }\n    this.restartPingInterval();\n  }\n\n  private restartPingInterval(): void {\n    clearInterval(this.pingIntervalId);\n    this.pingIntervalId = setInterval(() => {\n      const elapsedTime = Date.now() - this.lastMessageTime;\n      if (elapsedTime > this.pingInterval) {\n        const message = {\n          type: OutgoingMessageTypes.PING,\n        };\n        this.send(JSON.stringify(message));\n      }\n    }, this.pingInterval);\n  }\n\n  /**\n   * @description Set callback when the socket is opened.\n   *\n   */\n  set onOpen(callback: () => void) {\n    this.onOpenCallback = callback;\n  }\n\n  /**\n   * @description Set callback when the socket is closed.\n   *\n   */\n  set onClose(callback: () => void) {\n    this.onCloseCallback = callback;\n  }\n\n  /**\n   * @description Set callback when the socket receives a message.\n   *\n   */\n  set onMessage(callback: (event: SocketMessage) => void) {\n    this.onMessageCallback = callback;\n  }\n\n  getReadyState() {\n    return this.ws?.readyState;\n  }\n\n  /**\n   * @description Send a subscribe message to the websocket connection.\n   *\n   */\n  subscribe(channel: string, params?: object): void {\n    const message = {\n      type: OutgoingMessageTypes.SUBSCRIBE,\n      channel,\n      ...params,\n    };\n    this.send(JSON.stringify(message));\n  }\n\n  /**\n   * @description Send an unsubscribe message to the websocket connection.\n   *\n   */\n  unsubscribe(channel: string, params?: object): void {\n    const message = {\n      type: OutgoingMessageTypes.UNSUBSCRIBE,\n      channel,\n      ...params,\n    };\n    this.send(JSON.stringify(message));\n  }\n  /**\n   * @description Subscribe to candles channel\n   * for a specific market and resolution.\n   *\n   */\n  subscribeToCandles(\n    marketTicker: string,\n    resolution: CandlesResolution,\n  ): void {\n    const channel = SocketChannels.CANDLES;\n    const params = {\n      id: `${marketTicker}/${resolution}`,\n      batched: true,\n    };\n    this.subscribe(channel, params);\n  }\n\n  subscribeToSpotCandles(\n    marketTicker: string,\n    resolution: CandlesResolution,\n  ): void {\n    const channel = SocketChannels.SPOT_CANDLES;\n    const params = {\n      id: `${marketTicker}/${resolution}`,\n      batched: true,\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from candles channel\n   * for a specific market and resolution.\n   */\n  unsubscribeFromCandles(market: string, resolution: CandlesResolution): void {\n    const channel = SocketChannels.CANDLES;\n    const params = {\n      id: `${market}/${resolution}`,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  unsubscribeFromSpotCandles(\n    market: string,\n    resolution: CandlesResolution,\n  ): void {\n    const channel = SocketChannels.SPOT_CANDLES;\n    const params = {\n      id: `${market}/${resolution}`,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  /**\n   * @description Subscribe to prices channel\n   * for a specific assets pair.\n   *\n   */\n  subscribeToPrices(assetsPair: string): void {\n    const channel = SocketChannels.PRICES;\n    const params = {\n      id: assetsPair,\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from prices channel\n   * for a specific market and resolution.\n   */\n  unsubscribeFromPrices(assetsPair: string): void {\n    const channel = SocketChannels.PRICES;\n    const params = {\n      id: assetsPair,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  /**\n   * @description Subscribe to funding rate channel\n   * for a specific assets pair.\n   *\n   */\n  subscribeToFundingRate(assetsPair: string): void {\n    const channel = SocketChannels.FUNDING_RATES;\n    const params = {\n      id: assetsPair,\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from funding rate channel\n   * for a specific market and resolution.\n   */\n  unsubscribeFromFundingRate(assetsPair: string): void {\n    const channel = SocketChannels.FUNDING_RATES;\n    const params = {\n      id: assetsPair,\n    };\n    this.unsubscribe(channel, params);\n  }\n\n  /**\n   * @description Subscribe to markets updates channel\n   *\n   */\n  subscribeToMarketsUpdates(): void {\n    const channel = SocketChannels.MARKETS_UPDATES;\n    const params = {\n      id: '1',\n    };\n    this.subscribe(channel, params);\n  }\n\n  /**\n   * @description Unsubscribe from markets updates channel\n   */\n  unsubscribeFromMarketsUpdates(): void {\n    const channel = SocketChannels.MARKETS_UPDATES;\n    const params = {\n      id: '1',\n    };\n    this.unsubscribe(channel, params);\n  }\n}\n"]}

package/dist/types/clients/modules/isolated-order.simulation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/isolated-order.simulation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,yCAAyC,EACzC,yCAAyC,EACzC,qCAAqC,EACrC,qCAAqC,EACrC,sCAAsC,EACtC,sCAAsC,EACvC,MAAM,SAAS,CAAC;AACjB,OAAO,aAAa,MAAM,YAAY,CAAC;AACvC,OAAO,EAEL,eAAe,EACf,oBAAoB,EAGrB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,+CAA+C,EAC/C,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AAGnC,MAAM,CAAC,OAAO,OAAO,6BAA6B;IAChD,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAuB;gBAE3B,aAAa,EAAE,aAAa;IAMlC,GAAG,CAAC,MAAM,EAAE,qCAAqC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvE,MAAM,CAAC,wBAAwB,CAC7B,oBAAoB,EAAE,oBAAoB,GACzC,eAAe;YAqBJ,eAAe;IAW7B,QAAQ,CACN,MAAM,EAAE,qCAAqC,GAC5C,2BAA2B;IAmI9B,YAAY,CACV,MAAM,EAAE,yCAAyC,GAChD,yCAAyC;IAuB5C,0BAA0B,CACxB,MAAM,EAAE,+CAA+C,GACtD,iCAAiC;IAmDpC,cAAc,IAAI,MAAM,GAAG,IAAI;IAS/B,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;IA+ClE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;IAc/D,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,MAAM;IAQT,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;IAwCtD,gCAAgC,CAAC,EAC/B,kBAAkB,GACnB,EAAE,sCAAsC,GAAG,sCAAsC;IAsElF,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAUjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/isolated-order.simulation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,yCAAyC,EACzC,yCAAyC,EACzC,qCAAqC,EACrC,qCAAqC,EACrC,sCAAsC,EACtC,sCAAsC,EACvC,MAAM,SAAS,CAAC;AACjB,OAAO,aAAa,MAAM,YAAY,CAAC;AACvC,OAAO,EAEL,eAAe,EACf,oBAAoB,EAGrB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,+CAA+C,EAC/C,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AAInC,MAAM,CAAC,OAAO,OAAO,6BAA6B;IAChD,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAuB;gBAE3B,aAAa,EAAE,aAAa;IAMlC,GAAG,CAAC,MAAM,EAAE,qCAAqC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvE,MAAM,CAAC,wBAAwB,CAC7B,oBAAoB,EAAE,oBAAoB,GACzC,eAAe;YAqBJ,eAAe;IAW7B,QAAQ,CACN,MAAM,EAAE,qCAAqC,GAC5C,2BAA2B;IA4H9B,YAAY,CACV,MAAM,EAAE,yCAAyC,GAChD,yCAAyC;IAuB5C,0BAA0B,CACxB,MAAM,EAAE,+CAA+C,GACtD,iCAAiC;IAmDpC,cAAc,IAAI,MAAM,GAAG,IAAI;IAS/B,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;IA+ClE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;IAc/D,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,MAAM;IAQT,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;IAwCtD,gCAAgC,CAAC,EAC/B,kBAAkB,GACnB,EAAE,sCAAsC,GAAG,sCAAsC;IAsElF,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAUjC"}

package/dist/types/clients/modules/isolated-order.simulation/types.d.ts

@@ -1,4 +1,5 @@
 import { MarginAccountEntity, MarketEntity, EditCollateralAction } from '@reyaxyz/common';
+import { SimulateTradeFeeEntity } from '../trade.simulation/types';
 export type IsolatedOrderSimulationLoadDataParams = {
     marketId: MarketEntity['id'];
     marginAccountId: MarginAccountEntity['id'];
@@ -16,6 +17,7 @@ export type SimulateIsolatedOrderEntity = {
     liquidationPrice: number;
     fees: number;
     takerFeesPercentage: number;
+    feesV2: SimulateTradeFeeEntity;
     estimatedPrice: number;
     estimatedSlippage: number;
     marginRatio: MarginAccountEntity['marginRatioPercentage'];

package/dist/types/clients/modules/isolated-order.simulation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/isolated-order.simulation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,qCAAqC,GAAG;IAClD,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAC1D,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG,MAAM,CAAC;AAE/D,MAAM,MAAM,sCAAsC,GAAG;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sCAAsC,GAAG;IAEnD,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/isolated-order.simulation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,MAAM,qCAAqC,GAAG;IAClD,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAC1D,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG,MAAM,CAAC;AAE/D,MAAM,MAAM,sCAAsC,GAAG;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sCAAsC,GAAG;IAEnD,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC"}

package/dist/types/clients/modules/markets/index.d.ts

@@ -1,4 +1,4 @@
-import { GetCandlesParams, GetFundingRateChartDataParams, GetMarketParams, GetMarketResult, GetMarketsResult, GetMarketTradingHistoryParams, GetPoolPriceResult, GetSpotMarketsResult, GetTradingHistoryResult, MarketCandlesResponse } from './types';
+import { GetCandlesParams, GetFundingRateChartDataParams, GetMarketParams, GetMarketResult, GetMarketsResult, GetMarketTradingHistoryParams, GetPoolPriceResult, GetSpotCandlesParams, GetSpotMarketsResult, GetTradingHistoryResult, MarketCandlesResponse } from './types';
 import { GetFundingRateChartDataResult, RestClient } from '@reyaxyz/common';
 export default class MarketsClient extends RestClient {
     /**
@@ -36,6 +36,7 @@ export default class MarketsClient extends RestClient {
      * const marketCandles = await market.getMarketCandles('BTC-USD', '1HR', '2023-01-01T00:00:00Z', '2023-01-02T00:00:00Z');
      */
     getMarketCandles(params: GetCandlesParams): Promise<MarketCandlesResponse>;
+    getSpotMarketCandles(params: GetSpotCandlesParams): Promise<MarketCandlesResponse>;
     getMarketTradingHistory(params: GetMarketTradingHistoryParams): Promise<GetTradingHistoryResult>;
     getFundingRateChartData(params: GetFundingRateChartDataParams): Promise<GetFundingRateChartDataResult>;
 }

package/dist/types/clients/modules/markets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/markets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,6BAA6B,EAC7B,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD;;;;;;;;;;;;;;;;OAgBG;IAEG,UAAU,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAKvC,cAAc,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAK/C,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAK5D,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAMxE;;;;;;;;;;;;OAYG;IAEG,gBAAgB,CACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,qBAAqB,CAAC;IAU3B,uBAAuB,CAC3B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,uBAAuB,CAAC;IAQ7B,uBAAuB,CAC3B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,6BAA6B,CAAC;CAO1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/markets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,6BAA6B,EAC7B,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD;;;;;;;;;;;;;;;;OAgBG;IAEG,UAAU,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAKvC,cAAc,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAK/C,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAK5D,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAMxE;;;;;;;;;;;;OAYG;IAEG,gBAAgB,CACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,qBAAqB,CAAC;IAU3B,oBAAoB,CACxB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,qBAAqB,CAAC;IAU3B,uBAAuB,CAC3B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,uBAAuB,CAAC;IAQ7B,uBAAuB,CAC3B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,6BAA6B,CAAC;CAO1C"}

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

@@ -16,6 +16,13 @@ export type GetCandlesParams = {
     toISO?: string | null;
     limit?: number | null;
 };
+export type GetSpotCandlesParams = {
+    marketId: SpotMarketEntity['id'];
+    resolution: CandlesResolution;
+    fromISO?: string | null;
+    toISO?: string | null;
+    limit?: number | null;
+};
 export type GetMarketTradingHistoryParams = {
     marketId: number;
     limit?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/markets/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEhE,MAAM,MAAM,gBAAgB,GAAG,YAAY,EAAE,CAAC;AAC9C,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,EAAE,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,oBAAoB,EAAE,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,6BAA6B,CAAC;KAC5C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/markets/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEhE,MAAM,MAAM,gBAAgB,GAAG,YAAY,EAAE,CAAC;AAC9C,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,EAAE,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACjC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,oBAAoB,EAAE,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,6BAA6B,CAAC;KAC5C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}

package/dist/types/clients/modules/trade.simulation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/trade.simulation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,4BAA4B,EAC5B,4BAA4B,EAC5B,wBAAwB,EACxB,mBAAmB,EACnB,+CAA+C,EAC/C,iCAAiC,EACjC,iCAAiC,EACjC,6BAA6B,EAC7B,kCAAkC,EAClC,6BAA6B,EAC9B,MAAM,SAAS,CAAC;AACjB,OAAO,aAAa,MAAM,YAAY,CAAC;AAWvC,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACxC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,UAAU,CAIF;IAChB,OAAO,CAAC,aAAa,CAAgB;gBAEzB,aAAa,EAAE,aAAa;IAMlC,GAAG,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;YAsDjD,eAAe;IAW7B,QAAQ,CAAC,MAAM,EAAE,6BAA6B,GAAG,mBAAmB;IAiJpE,oBAAoB,IAAI,MAAM;IAyB9B,aAAa,CACX,MAAM,EAAE,kCAAkC,GACzC,wBAAwB;IAwF3B,yBAAyB,CACvB,MAAM,EAAE,4BAA4B,GACnC,4BAA4B;IAoC/B,YAAY,CACV,MAAM,EAAE,iCAAiC,GACxC,iCAAiC;IAyBpC,0BAA0B,CACxB,MAAM,EAAE,+CAA+C,GACtD,iCAAiC;IAkCpC,cAAc,IAAI,MAAM,GAAG,IAAI;IAU/B,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;IA+BlE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;IAc/D,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAejC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/trade.simulation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,4BAA4B,EAC5B,4BAA4B,EAC5B,wBAAwB,EACxB,mBAAmB,EACnB,+CAA+C,EAC/C,iCAAiC,EACjC,iCAAiC,EACjC,6BAA6B,EAC7B,kCAAkC,EAClC,6BAA6B,EAC9B,MAAM,SAAS,CAAC;AACjB,OAAO,aAAa,MAAM,YAAY,CAAC;AAYvC,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACxC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,UAAU,CAIF;IAChB,OAAO,CAAC,aAAa,CAAgB;gBAEzB,aAAa,EAAE,aAAa;IAMlC,GAAG,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;YAsDjD,eAAe;IAW7B,QAAQ,CAAC,MAAM,EAAE,6BAA6B,GAAG,mBAAmB;IA0IpE,oBAAoB,IAAI,MAAM;IAyB9B,aAAa,CACX,MAAM,EAAE,kCAAkC,GACzC,wBAAwB;IA0F3B,yBAAyB,CACvB,MAAM,EAAE,4BAA4B,GACnC,4BAA4B;IAoC/B,YAAY,CACV,MAAM,EAAE,iCAAiC,GACxC,iCAAiC;IAyBpC,0BAA0B,CACxB,MAAM,EAAE,+CAA+C,GACtD,iCAAiC;IAkCpC,cAAc,IAAI,MAAM,GAAG,IAAI;IAU/B,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;IA+BlE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;IAc/D,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAejC"}

package/dist/types/clients/modules/trade.simulation/types.d.ts

@@ -23,10 +23,19 @@ export type TradeSimulationConvertValueEstimatedPriceParams = {
     fromBase: boolean;
 };
 export type TradeSimulationConvertValueEstimatedPriceResult = number;
+export type SimulateTradeFeeEntity = {
+    feeTier: number;
+    feePercentage: number;
+    rebalancingFeePercentage: number;
+    fee: number;
+    imbalancingFee: number;
+    rebalancingFee: number;
+};
 export type SimulateTradeEntity = {
     liquidationPrice: number;
     fees: number;
     takerFeesPercentage: number;
+    feesV2: SimulateTradeFeeEntity;
     estimatedPrice: number;
     estimatedSlippage: number;
     marginRatio: MarginAccountEntity['marginRatioPercentage'];

package/dist/types/clients/modules/trade.simulation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/trade.simulation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,+CAA+C,GAAG;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,+CAA+C,GAAG,MAAM,CAAC;AAErE,MAAM,MAAM,mBAAmB,GAAG;IAChC,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAC1D,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAC1D,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,MAAM,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/trade.simulation/types.ts"],"names":[],"mappings":"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"}

package/dist/types/clients/modules/trade.simulation/utils.d.ts

@@ -0,0 +1,8 @@
+import { TradeSimulationState } from '@reyaxyz/common';
+import { SimulateTradeFeeEntity } from './types';
+export declare const computeFee: ({ tradeSimulationState, marketId, orderBase, }: {
+    marketId: number;
+    tradeSimulationState: TradeSimulationState;
+    orderBase: number;
+}) => SimulateTradeFeeEntity;
+//# sourceMappingURL=utils.d.ts.map

package/dist/types/clients/modules/trade.simulation/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"/","sources":["clients/modules/trade.simulation/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD,eAAO,MAAM,UAAU;cAKX,MAAM;0BACM,oBAAoB;eAC/B,MAAM;MACf,sBAwCH,CAAC"}

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

@@ -3,7 +3,8 @@ export declare enum SocketChannels {
     CANDLES = "candles",
     PRICES = "prices",
     FUNDING_RATES = "funding-rates",
-    MARKETS_UPDATES = "markets-updates"
+    MARKETS_UPDATES = "markets-updates",
+    SPOT_CANDLES = "spot-candles"
 }
 export declare enum IncomingMessageTypes {
     CONNECTED = "connected",
@@ -142,11 +143,13 @@ export declare class SocketClient {
      *
      */
     subscribeToCandles(marketTicker: string, resolution: CandlesResolution): void;
+    subscribeToSpotCandles(marketTicker: string, resolution: CandlesResolution): void;
     /**
      * @description Unsubscribe from candles channel
      * for a specific market and resolution.
      */
     unsubscribeFromCandles(market: string, resolution: CandlesResolution): void;
+    unsubscribeFromSpotCandles(market: string, resolution: CandlesResolution): void;
     /**
      * @description Subscribe to prices channel
      * for a specific assets pair.

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

@@ -1 +1 @@
-{"version":3,"file":"socket-client.d.ts","sourceRoot":"/","sources":["clients/socket-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"socket-client.d.ts","sourceRoot":"/","sources":["clients/socket-client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/api-sdk",
-  "version": "0.143.1",
+  "version": "0.144.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -33,7 +33,7 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.229.0",
+    "@reyaxyz/common": "0.230.0",
     "@simplewebauthn/types": "^10.0.0",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.2",
@@ -42,7 +42,7 @@
     "ws": "^8.16.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "a02d4b3181ece9c3d0f024a51d1d06ac7c071582",
+  "gitHead": "535fb6356a154bbe5dd57eecc42d7c0ba920c8b0",
   "devDependencies": {
     "@types/ws": "8.5.10"
   }

package/src/clients/modules/isolated-order.simulation/index.ts

@@ -24,6 +24,7 @@ import {
   TradeSimulationConvertValueResult,
 } from '../trade.simulation/types';
 import { INSTANT_TRADING_RATE_XP } from '@reyaxyz/common';
+import { computeFee } from '../trade.simulation/utils';
 
 export default class IsolatedOrderSimulationClient {
   private loadedData: TradeSimulationState | null = null;
@@ -81,21 +82,20 @@ export default class IsolatedOrderSimulationClient {
   simulate(
     params: IsolatedOrderSimulationSimulateParams,
   ): SimulateIsolatedOrderEntity {
-    if (!this.loadedData) {
+    if (!this.loadedData || !this.marketId) {
       throw new Error('Data not loaded. Call arm() first.');
     }
 
+    const oraclePrice =
+      this.loadedData.exposureDataPassivePool.oraclePricePerMarket[
+        this.loadedData.marketConfiguration.market_id
+      ];
+
     let amount;
     if (params.fromBase) {
       amount = params.amount;
     } else {
-      amount = BigNumber(params.amount)
-        .div(
-          this.loadedData.exposureDataPassivePool.oraclePricePerMarket[
-            this.loadedData.marketConfiguration.market_id
-          ],
-        )
-        .toNumber();
+      amount = BigNumber(params.amount).div(oraclePrice).toNumber();
     }
 
     const userAccountExposure =
@@ -114,21 +114,17 @@ export default class IsolatedOrderSimulationClient {
       this.loadedData.marketStorage,
     );
     const estimatedPrice = ExposureCommand.calculateEstimatedPrice(
-      this.loadedData.exposureDataPassivePool.oraclePricePerMarket[
-        this.loadedData.marketConfiguration.market_id
-      ],
+      oraclePrice,
       slippage,
     );
 
     const amountSize = estimatedPrice * amount;
 
-    const fees = ExposureCommand.calculateFee(
-      this.loadedData.exposureDataPassivePool.oraclePricePerMarket[
-        this.loadedData.marketConfiguration.market_id
-      ],
-      amount,
-      this.loadedData.feeParameter,
-    );
+    const feesV2 = computeFee({
+      tradeSimulationState: this.loadedData,
+      marketId: this.marketId,
+      orderBase: amount,
+    });
 
     /*
        amount of margin in rUSD terms that needs to be transferred from the source account to the destination account,
@@ -164,9 +160,7 @@ export default class IsolatedOrderSimulationClient {
     const liquidationPrice = ExposureCommand.calculateLiquidation(
       requiredMargin,
       isolatedLMR,
-      this.loadedData.exposureDataPassivePool.oraclePricePerMarket[
-        this.loadedData.marketConfiguration.market_id
-      ],
+      oraclePrice,
       amount,
     );
 
@@ -193,9 +187,9 @@ export default class IsolatedOrderSimulationClient {
     return {
       estimatedPrice: estimatedPrice,
       estimatedSlippage: slippage * 100,
-      fees: fees,
-      takerFeesPercentage:
-        BigNumber(this.loadedData.feeParameter).toNumber() * 100,
+      fees: feesV2.fee,
+      takerFeesPercentage: feesV2.feePercentage,
+      feesV2,
       liquidationPrice: liquidationPrice.toNumber(),
       marginRatio: marginRatio * 100,
       marginRatioHealth: marginRatioHealth,
@@ -208,7 +202,7 @@ export default class IsolatedOrderSimulationClient {
         max: xpEarnRangeMax,
       },
       maxSlippage: 1,
-    } as SimulateIsolatedOrderEntity;
+    };
   }
 
   convertValue(

package/src/clients/modules/isolated-order.simulation/types.ts

@@ -3,6 +3,7 @@ import {
   MarketEntity,
   EditCollateralAction,
 } from '@reyaxyz/common';
+import { SimulateTradeFeeEntity } from '../trade.simulation/types';
 
 export type IsolatedOrderSimulationLoadDataParams = {
   marketId: MarketEntity['id'];
@@ -24,6 +25,7 @@ export type SimulateIsolatedOrderEntity = {
   liquidationPrice: number;
   fees: number;
   takerFeesPercentage: number;
+  feesV2: SimulateTradeFeeEntity;
   estimatedPrice: number;
   estimatedSlippage: number;
   marginRatio: MarginAccountEntity['marginRatioPercentage'];

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

@@ -6,6 +6,7 @@ import {
   GetMarketsResult,
   GetMarketTradingHistoryParams,
   GetPoolPriceResult,
+  GetSpotCandlesParams,
   GetSpotMarketsResult,
   GetTradingHistoryResult,
   MarketCandlesResponse,
@@ -82,6 +83,18 @@ export default class MarketsClient extends RestClient {
     });
   }
 
+  async getSpotMarketCandles(
+    params: GetSpotCandlesParams,
+  ): Promise<MarketCandlesResponse> {
+    const uri = `/api/spot-markets/candles/${params.marketId}`;
+    return this.get(uri, {
+      resolution: params.resolution,
+      fromISO: params.fromISO,
+      toISO: params.toISO,
+      limit: params.limit,
+    });
+  }
+
   async getMarketTradingHistory(
     params: GetMarketTradingHistoryParams,
   ): Promise<GetTradingHistoryResult> {

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

@@ -28,6 +28,14 @@ export type GetCandlesParams = {
   limit?: number | null;
 };
 
+export type GetSpotCandlesParams = {
+  marketId: SpotMarketEntity['id'];
+  resolution: CandlesResolution;
+  fromISO?: string | null;
+  toISO?: string | null;
+  limit?: number | null;
+};
+
 export type GetMarketTradingHistoryParams = {
   marketId: number;
   limit?: number;

package/src/clients/modules/trade.simulation/index.ts

@@ -22,6 +22,7 @@ import {
 } from '@reyaxyz/common';
 import BigNumber from 'bignumber.js';
 import { INSTANT_TRADING_RATE_XP } from '@reyaxyz/common';
+import { computeFee } from './utils';
 
 export default class TradeSimulationClient {
   private marketId: number | null = null;
@@ -105,24 +106,23 @@ export default class TradeSimulationClient {
 
   // Synchronous method to simulate operations based on an amount
   simulate(params: TradeSimulationSimulateParams): SimulateTradeEntity {
-    if (!this.loadedData) {
+    if (!this.loadedData || !this.marketId) {
       throw new Error('Data not loaded. Call arm() first.');
     }
 
     const { tradeSimulationState, userAccountExposure, passivePoolExposure } =
       this.loadedData;
 
+    const oraclePrice =
+      tradeSimulationState.exposureDataPassivePool.oraclePricePerMarket[
+        tradeSimulationState.marketConfiguration.market_id
+      ];
+
     let amount;
     if (params.fromBase) {
       amount = params.amount;
     } else {
-      amount = BigNumber(params.amount)
-        .div(
-          tradeSimulationState.exposureDataPassivePool.oraclePricePerMarket[
-            tradeSimulationState.marketConfiguration.market_id
-          ],
-        )
-        .toNumber();
+      amount = BigNumber(params.amount).div(oraclePrice).toNumber();
     }
 
     /*
@@ -143,19 +143,15 @@ export default class TradeSimulationClient {
     );
 
     const estimatedPrice = ExposureCommand.calculateEstimatedPrice(
-      tradeSimulationState.exposureDataPassivePool.oraclePricePerMarket[
-        tradeSimulationState.marketConfiguration.market_id
-      ],
+      oraclePrice,
       slippage,
     );
 
-    const fees = ExposureCommand.calculateFee(
-      tradeSimulationState.exposureDataPassivePool.oraclePricePerMarket[
-        tradeSimulationState.marketConfiguration.market_id
-      ],
-      amount,
-      tradeSimulationState.feeParameter,
-    );
+    const feesV2 = computeFee({
+      tradeSimulationState,
+      marketId: this.marketId,
+      orderBase: amount,
+    });
 
     const {
       usdNodeMarginInfo: newMarginInfo,
@@ -202,9 +198,7 @@ export default class TradeSimulationClient {
     const liquidationPrice = ExposureCommand.calculateLiquidation(
       newMarginInfo.marginBalance,
       newQuoteTokenMarginInfo.liquidationMarginRequirement,
-      tradeSimulationState.exposureDataPassivePool.oraclePricePerMarket[
-        tradeSimulationState.marketConfiguration.market_id
-      ],
+      oraclePrice,
       BigNumber(positionInfo?.base || 0).toNumber(),
     );
 
@@ -230,9 +224,9 @@ export default class TradeSimulationClient {
     return {
       estimatedPrice,
       estimatedSlippage: slippage * 100,
-      fees,
-      takerFeesPercentage:
-        BigNumber(tradeSimulationState.feeParameter).toNumber() * 100,
+      fees: feesV2.fee,
+      takerFeesPercentage: feesV2.feePercentage,
+      feesV2,
       liquidationPrice: liquidationPrice.toNumber(),
       marginRatio: marginRatio * 100,
       marginRatioHealth,
@@ -246,7 +240,7 @@ export default class TradeSimulationClient {
         max: xpEarnRangeMax,
       },
       maxSlippage: 1,
-    } as SimulateTradeEntity;
+    };
   }
 
   getRiskMatrixElement(): number {
@@ -297,11 +291,13 @@ export default class TradeSimulationClient {
     const snappedAmountInBase = this.roundToBaseSpacing(amount, baseSpacing);
     const snappedAmount = snappedAmountInBase * params.triggerPrice;
 
-    const fees = ExposureCommand.calculateFee(
-      params.triggerPrice,
-      amount,
-      tradeSimulationState.feeParameter,
-    );
+    const { fee: fees } = ExposureCommand.calculateFee({
+      oraclePrice: params.triggerPrice,
+      orderBase: amount,
+      poolBasePreTrade: 0,
+      feeParameter: tradeSimulationState.feeParameter,
+      rebalancingFeeParameter: BigNumber(0),
+    });
 
     const marginBalance =
       userAccountExposure.getUsdNodeMarginInfo.marginBalance;

package/src/clients/modules/trade.simulation/types.ts

@@ -31,10 +31,20 @@ export type TradeSimulationConvertValueEstimatedPriceParams = {
 
 export type TradeSimulationConvertValueEstimatedPriceResult = number;
 
+export type SimulateTradeFeeEntity = {
+  feeTier: number;
+  feePercentage: number;
+  rebalancingFeePercentage: number;
+  fee: number;
+  imbalancingFee: number;
+  rebalancingFee: number;
+};
+
 export type SimulateTradeEntity = {
   liquidationPrice: number;
-  fees: number;
-  takerFeesPercentage: number;
+  fees: number; // TODO: deprecate when feeV2 is linked up
+  takerFeesPercentage: number; // TODO: deprecate when feeV2 is linked up
+  feesV2: SimulateTradeFeeEntity;
   estimatedPrice: number;
   estimatedSlippage: number;
   marginRatio: MarginAccountEntity['marginRatioPercentage'];

package/src/clients/modules/trade.simulation/utils.ts

@@ -0,0 +1,52 @@
+import { ExposureCommand, TradeSimulationState } from '@reyaxyz/common';
+import { SimulateTradeFeeEntity } from './types';
+
+export const computeFee = ({
+  tradeSimulationState,
+  marketId,
+  orderBase,
+}: {
+  marketId: number;
+  tradeSimulationState: TradeSimulationState;
+  orderBase: number;
+}): SimulateTradeFeeEntity => {
+  const oraclePrice =
+    tradeSimulationState.exposureDataPassivePool.oraclePricePerMarket[
+      tradeSimulationState.marketConfiguration.market_id
+    ];
+
+  const poolPosition =
+    tradeSimulationState.exposureDataPassivePool.positionInfoMarketConfiguration.find(
+      (p) => p.market_id === marketId,
+    );
+
+  const poolBasePreTrade = Number(poolPosition?.base || 0);
+
+  // TODO: once api is updated, change to the following:
+  // const { feeParameter, rebalancingFeeParameter, feeTier } =
+  //   tradeSimulationState.feeParameters;
+
+  const feeParameter = tradeSimulationState.feeParameter;
+  const rebalancingFeeParameter = tradeSimulationState.feeParameter;
+  const feeTier = 0;
+
+  const { fee, rebalancingFee, imbalancingFee } = ExposureCommand.calculateFee({
+    oraclePrice,
+    orderBase,
+    poolBasePreTrade,
+    feeParameter,
+    rebalancingFeeParameter,
+  });
+
+  const feePercentage = Number(feeParameter) * 100;
+  const rebalancingFeePercentage = Number(rebalancingFeeParameter) * 100;
+
+  return {
+    feeTier,
+    feePercentage,
+    rebalancingFeePercentage,
+    fee,
+    rebalancingFee,
+    imbalancingFee,
+  };
+};