chore: add tradeId filter to fetchOrders

InjectiveLabs · Feb 12, 2025 · 8822606 · 8822606
1 parent a46ac7b
commit 8822606
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 36 deletions.
diff --git a/packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcDerivativesApi.ts b/packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcDerivativesApi.ts
@@ -198,22 +198,24 @@ export class IndexerGrpcDerivativesApi extends BaseGrpcConsumer {
   }
 
   async fetchOrders(params?: {
+    cid?: string
+    tradeId?: string
     marketId?: string
     marketIds?: string[]
     orderSide?: OrderSide
-    isConditional?: boolean
+    pagination?: PaginationOption
     subaccountId?: string
-    pagination?: PaginationOption,
-    cid?: string
+    isConditional?: boolean
   }) {
     const {
+      cid,
       marketId,
       marketIds,
-      subaccountId,
       orderSide,
-      isConditional,
       pagination,
-      cid,
+      isConditional,
+      subaccountId,
+      tradeId,
     } = params || {}
 
     const request = InjectiveDerivativeExchangeRpc.OrdersRequest.create()
@@ -242,6 +244,10 @@ export class IndexerGrpcDerivativesApi extends BaseGrpcConsumer {
       request.cid = cid
     }
 
+    if (tradeId) {
+      request.tradeId = tradeId
+    }
+
     if (pagination) {
       if (pagination.skip !== undefined) {
         request.skip = pagination.skip.toString()
@@ -285,28 +291,30 @@ export class IndexerGrpcDerivativesApi extends BaseGrpcConsumer {
   }
 
   async fetchOrderHistory(params?: {
-    subaccountId?: string
+    cid?: string
+    state?: OrderState
+    tradeId?: string
     marketId?: string
     marketIds?: string[]
     orderTypes?: OrderSide[]
-    executionTypes?: TradeExecutionType[]
     direction?: TradeDirection
-    isConditional?: boolean
-    state?: OrderState
-    cid?: string,
     pagination?: PaginationOption
+    subaccountId?: string
+    isConditional?: boolean
+    executionTypes?: TradeExecutionType[]
   }) {
     const {
-      subaccountId,
+      cid,
+      state,
+      tradeId,
       marketId,
       marketIds,
-      orderTypes,
-      executionTypes,
       direction,
-      isConditional,
-      state,
       pagination,
-      cid,
+      orderTypes,
+      subaccountId,
+      isConditional,
+      executionTypes,
     } = params || {}
 
     const request = InjectiveDerivativeExchangeRpc.OrdersHistoryRequest.create()
@@ -347,6 +355,10 @@ export class IndexerGrpcDerivativesApi extends BaseGrpcConsumer {
       request.cid = cid
     }
 
+    if (tradeId) {
+      request.tradeId = tradeId
+    }
+
     if (pagination) {
       if (pagination.skip !== undefined) {
         request.skip = pagination.skip.toString()

diff --git a/packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcSpotApi.ts b/packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcSpotApi.ts
@@ -122,9 +122,17 @@ export class IndexerGrpcSpotApi extends BaseGrpcConsumer {
     isConditional?: boolean
     pagination?: PaginationOption
     cid?: string
+    tradeId?: string
   }) {
-    const { marketId, marketIds, subaccountId, orderSide, pagination, cid } =
-      params || {}
+    const {
+      cid,
+      tradeId,
+      marketId,
+      marketIds,
+      orderSide,
+      pagination,
+      subaccountId,
+    } = params || {}
     const request = InjectiveSpotExchangeRpc.OrdersRequest.create()
 
     if (marketId) {
@@ -147,11 +155,13 @@ export class IndexerGrpcSpotApi extends BaseGrpcConsumer {
       request.cid = cid
     }
 
-    /*
-    if (isConditional !== undefined) {
-      request.isConditional =isConditional
+    if (tradeId) {
+      request.tradeId = tradeId
     }
-    */
+
+    // if (isConditional !== undefined) {
+    //   request.isConditional = isConditional
+    // }
 
     if (pagination) {
       if (pagination.skip !== undefined) {
@@ -196,27 +206,29 @@ export class IndexerGrpcSpotApi extends BaseGrpcConsumer {
   }
 
   async fetchOrderHistory(params?: {
-    subaccountId?: string
+    cid?: string
+    state?: OrderState
+    tradeId?: string
     marketId?: string
     marketIds?: string[]
-    orderTypes?: OrderSide[]
-    executionTypes?: TradeExecutionType[]
     direction?: TradeDirection
-    isConditional?: boolean
-    state?: OrderState
+    orderTypes?: OrderSide[]
     pagination?: PaginationOption
-    cid?: string
+    isConditional?: boolean
+    executionTypes?: TradeExecutionType[]
+    subaccountId?: string
   }) {
     const {
-      subaccountId,
+      cid,
+      state,
+      tradeId,
       marketId,
+      direction,
       marketIds,
       orderTypes,
-      executionTypes,
-      direction,
-      state,
       pagination,
-      cid,
+      subaccountId,
+      executionTypes,
     } = params || {}
 
     const request = InjectiveSpotExchangeRpc.OrdersHistoryRequest.create()
@@ -253,6 +265,10 @@ export class IndexerGrpcSpotApi extends BaseGrpcConsumer {
       request.cid = cid
     }
 
+    if (tradeId) {
+      request.tradeId = tradeId
+    }
+
     /*
     if (isConditional !== undefined) {
       request.isConditional =isConditional
@@ -329,7 +345,7 @@ export class IndexerGrpcSpotApi extends BaseGrpcConsumer {
       executionSide,
       executionTypes,
       accountAddress,
-      cid
+      cid,
     } = params || {}
 
     const request = InjectiveSpotExchangeRpc.TradesRequest.create()
@@ -375,7 +391,7 @@ export class IndexerGrpcSpotApi extends BaseGrpcConsumer {
     }
 
     if (cid) {
-      request.cid = cid;
+      request.cid = cid
     }
 
     if (pagination) {