chore: tc endpoints alignment

Author: Frederick-88

packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcTcDerivativesApi.ts

@@ -21,7 +21,7 @@ export class IndexerGrpcTcDerivativesApi extends BaseIndexerGrpcConsumer {
     direction?: string
     accountAddress?: string
   }) {
-    const { marketId, direction, perPage, token, accountAddress } = params || {}
+    const { token, perPage, marketId, direction, accountAddress } = params || {}
 
     const request = InjectiveTCDerivativesRpcPb.OrdersHistoryRequest.create()
 

packages/sdk-ts/src/client/indexer/transformers/IndexerGrpcTcDerivativesTransformer.ts

@@ -1,13 +1,18 @@
-import { TradeDirection } from '../../../types/index.js'
+import { OrderState, TradeDirection } from '../../../types/index.js'
 import type * as InjectiveTCDerivativesRpcPb from '@injectivelabs/indexer-proto-ts-v2/generated/injective_tc_derivatives_rpc_pb'
+import type {
+  OrderSide,
+  TradeExecutionSide,
+  TradeExecutionType,
+} from '../../../types/index.js'
 import type {
   TcPositionDelta,
   GrpcTcPositionDelta,
   TcDerivativePosition,
   TcDerivativeLimitOrder,
   TcDerivativeTradeHistory,
-  TcDerivativeOrderHistory,
   GrpcTcDerivativePosition,
+  TcDerivativeOrderHistory,
   GrpcTcDerivativeLimitOrder,
   TcDerivativeTradesResponse,
   TcDerivativeOrdersResponse,
@@ -32,10 +37,10 @@ export class IndexerGrpcTcDerivativesTransformer {
     positionDelta: GrpcTcPositionDelta,
   ): TcPositionDelta {
     return {
-      tradeDirection: positionDelta.tradeDirection,
       executionPrice: positionDelta.executionPrice,
       executionMargin: positionDelta.executionMargin,
       executionQuantity: positionDelta.executionQuantity,
+      tradeDirection: positionDelta.tradeDirection as TradeDirection,
     }
   }
 
@@ -45,15 +50,14 @@ export class IndexerGrpcTcDerivativesTransformer {
     return {
       cid: order.cid,
       price: order.price,
-      state: order.state,
       margin: order.margin,
       txHash: order.txHash,
       marketId: order.marketId,
       isActive: order.isActive,
       quantity: order.quantity,
       orderHash: order.orderHash,
       orderType: order.orderType,
-      direction: order.direction,
+      state: order.state as OrderState,
       subaccountId: order.subaccountId,
       triggerPrice: order.triggerPrice,
       isReduceOnly: order.isReduceOnly,
@@ -64,6 +68,7 @@ export class IndexerGrpcTcDerivativesTransformer {
       triggerAt: Number(order.triggerAt),
       filledQuantity: order.filledQuantity,
       placedOrderHash: order.placedOrderHash,
+      direction: order.direction as TradeDirection,
     }
   }
 
@@ -88,9 +93,9 @@ export class IndexerGrpcTcDerivativesTransformer {
       subaccountId: trade.subaccountId,
       feeRecipient: trade.feeRecipient,
       isLiquidation: trade.isLiquidation,
-      executionSide: trade.executionSide,
       executedAt: Number(trade.executedAt),
-      tradeExecutionType: trade.tradeExecutionType,
+      executionSide: trade.executionSide as TradeExecutionSide,
+      tradeExecutionType: trade.tradeExecutionType as TradeExecutionType,
       ...mappedPositionDelta,
     }
   }
@@ -104,14 +109,14 @@ export class IndexerGrpcTcDerivativesTransformer {
       margin: position.margin,
       marketId: position.marketId,
       quantity: position.quantity,
-      direction: position.direction,
       markPrice: position.markPrice,
       entryPrice: position.entryPrice,
       fundingSum: position.fundingSum,
       fundingLast: position.fundingLast,
       subaccountId: position.subaccountId,
       updatedAt: Number(position.updatedAt),
       liquidationPrice: position.liquidationPrice,
+      direction: position.direction as TradeDirection,
       cumulativeFundingEntry: position.cumulativeFundingEntry,
       effectiveCumulativeFundingEntry: position.effectiveCumulativeFundingEntry,
     }
@@ -123,36 +128,40 @@ export class IndexerGrpcTcDerivativesTransformer {
     return {
       cid: order.cid,
       price: order.price,
-      state: order.state,
       margin: order.margin,
       marketId: order.marketId,
       quantity: order.quantity,
       orderHash: order.orderHash,
-      orderSide: order.orderSide,
       orderType: order.orderType,
       subaccountId: order.subaccountId,
       isReduceOnly: order.isReduceOnly,
       triggerPrice: order.triggerPrice,
       feeRecipient: order.feeRecipient,
+      state: order.state as OrderState,
       createdAt: Number(order.createdAt),
       updatedAt: Number(order.updatedAt),
       isConditional: order.isConditional,
       triggerAt: Number(order.triggerAt),
       executionType: order.executionType,
       orderNumber: Number(order.orderNumber),
       placedOrderHash: order.placedOrderHash,
+      orderSide: order.orderSide as OrderSide,
       unfilledQuantity: order.unfilledQuantity,
     }
   }
 
   static ordersHistoryResponseToOrdersHistory(
     response: InjectiveTCDerivativesRpcPb.OrdersHistoryResponse,
   ): TcDerivativesOrdersHistoryResponse {
+    const filteredOrderHistory = response.orders?.filter(
+      (order) => order.state !== OrderState.Booked,
+    )
+
     return {
-      orders: response.orders.map(
+      next: response.next,
+      orders: filteredOrderHistory.map(
         IndexerGrpcTcDerivativesTransformer.grpcOrderHistoryToOrderHistory,
       ),
-      next: response.next,
     }
   }
 
@@ -171,22 +180,22 @@ export class IndexerGrpcTcDerivativesTransformer {
     response: InjectiveTCDerivativesRpcPb.TradesResponse,
   ): TcDerivativeTradesResponse {
     return {
+      next: response.next,
       trades: response.trades.map(
         IndexerGrpcTcDerivativesTransformer.grpcTradeToTrade,
       ),
-      next: response.next,
     }
   }
 
   static positionsResponseToPositions(
     response: InjectiveTCDerivativesRpcPb.PositionsResponse,
   ): TcDerivativesPositionsResponse {
     return {
+      next: response.next,
+      total: response.total ? Number(response.total) : undefined,
       positions: response.positions.map(
         IndexerGrpcTcDerivativesTransformer.grpcPositionToPosition,
       ),
-      next: response.next,
-      total: response.total ? Number(response.total) : undefined,
     }
   }
 }

packages/sdk-ts/src/client/indexer/types/tc-derivatives.ts

@@ -1,7 +1,14 @@
 import type * as InjectiveTCDerivativesRpcPb from '@injectivelabs/indexer-proto-ts-v2/generated/injective_tc_derivatives_rpc_pb'
+import type {
+  OrderSide,
+  OrderState,
+  TradeDirection,
+  TradeExecutionSide,
+  TradeExecutionType,
+} from '../../../types/index.js'
 
 export interface TcPositionDelta {
-  tradeDirection: string
+  tradeDirection: TradeDirection
   executionPrice: string
   executionQuantity: string
   executionMargin: string
@@ -10,17 +17,16 @@ export interface TcPositionDelta {
 export interface TcDerivativeOrderHistory {
   cid: string
   price: string
-  state: string
   margin: string
   txHash: string
   marketId: string
   quantity: string
+  state: OrderState
   orderHash: string
   isActive: boolean
   orderType: string
   createdAt: number
   updatedAt: number
-  direction: string
   triggerAt: number
   subaccountId: string
   triggerPrice: string
@@ -29,6 +35,7 @@ export interface TcDerivativeOrderHistory {
   filledQuantity: string
   isConditional: boolean
   placedOrderHash: string
+  direction: TradeDirection
 }
 
 export interface TcDerivativeTradeHistory {
@@ -42,13 +49,13 @@ export interface TcDerivativeTradeHistory {
   executedAt: number
   subaccountId: string
   feeRecipient: string
-  executionSide: string
   isLiquidation: boolean
-  tradeDirection: string
   executionPrice: string
   executionMargin: string
   executionQuantity: string
-  tradeExecutionType: string
+  tradeDirection: TradeDirection
+  executionSide: TradeExecutionSide
+  tradeExecutionType: TradeExecutionType
 }
 
 export interface TcDerivativePosition {
@@ -57,32 +64,32 @@ export interface TcDerivativePosition {
   margin: string
   marketId: string
   quantity: string
-  direction: string
   markPrice: string
   updatedAt: number
   entryPrice: string
   fundingSum: string
   fundingLast: string
   subaccountId: string
   liquidationPrice: string
+  direction: TradeDirection
   cumulativeFundingEntry: string
   effectiveCumulativeFundingEntry: string
 }
 
 export interface TcDerivativeLimitOrder {
   cid: string
   price: string
-  state: string
   margin: string
   marketId: string
   quantity: string
+  state: OrderState
   orderHash: string
-  orderSide: string
   createdAt: number
   updatedAt: number
   orderType: string
   triggerAt: number
   orderNumber: number
+  orderSide: OrderSide
   subaccountId: string
   triggerPrice: string
   feeRecipient: string