Merge pull request #154 from InjectiveLabs/f/add_historical_orders_me…

…thods

F/add historical orders methods

README.md

@@ -78,6 +78,10 @@ Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/mas
 
 
 ### Changelogs
+**0.5.8.5**
+* Add StreamOrdersHistory
+* Add more request params in OrdersHistory
+
 **0.5.8.4**
 * Adjust block and timeouts to new block time
 * Set explicit version for protobuf and grpcio-tool dependencies

examples/exchange_client/derivative_exchange_rpc/10_StreamOrders.py → examples/exchange_client/derivative_exchange_rpc/10_StreamHistoricalOrders.py

@@ -22,13 +22,11 @@
 async def main() -> None:
     network = Network.testnet()
     client = AsyncClient(network, insecure=False)
-    market_id = "0x4ca0f92fc28be0c9761326016b5a1a2177dd6375558365116b5bdda9abc229ce"
-    order_side = "buy"  # buy or sell
+    market_id = "0x1c79dac019f73e4060494ab1b4fcba734350656d6fc4d474f6a238c13c6f9ced"
+    order_side = "sell"  # sell or buy
     subaccount_id = "0xc6fe5d33615a1c52c08018c47e8bc53646a0e101000000000000000000000000"
-    orders = await client.stream_derivative_orders(
-        market_id=market_id,
-        order_side=order_side,
-        subaccount_id=subaccount_id
+    orders = await client.stream_historical_derivative_orders(
+        market_id=market_id
     )
     async for order in orders:
         print(order)

examples/exchange_client/spot_exchange_rpc/8_StreamOrders.py → examples/exchange_client/spot_exchange_rpc/8_StreamHistoricalOrders.py

@@ -25,10 +25,10 @@ async def main() -> None:
     market_id = "0xa508cb32923323679f29a032c70342c147c17d0145625922b0ef22e955c844c0"
     order_side = "sell"  # sell or buy
     subaccount_id = "0xc6fe5d33615a1c52c08018c47e8bc53646a0e101000000000000000000000000"
-    orders = await client.stream_spot_orders(
+    limit = 2
+    orders = await client.stream_historical_spot_orders(
         market_id=market_id,
-        order_side=order_side,
-        subaccount_id=subaccount_id
+        limit=limit
     )
     async for order in orders:
         print(order)

pyinjective/async_client.py

@@ -618,6 +618,7 @@ async def get_historical_spot_orders(self, market_id: str, **kwargs):
             market_id=market_id,
             direction=kwargs.get("direction"),
             order_types=kwargs.get("order_types"),
+            execution_types=kwargs.get("execution_types"),
             subaccount_id=kwargs.get("subaccount_id"),
             skip=kwargs.get("skip"),
             limit=kwargs.get("limit"),
@@ -661,6 +662,30 @@ async def stream_spot_orders(self, market_id: str, **kwargs):
         metadata = await self.load_cookie(type="exchange")
         return self.stubSpotExchange.StreamOrders.__call__(req, metadata=metadata)
 
+    async def stream_historical_spot_orders(self, market_id: str, **kwargs):
+        req = spot_exchange_rpc_pb.StreamOrdersHistoryRequest(
+            market_id=market_id,
+            direction=kwargs.get("direction"),
+            subaccount_id=kwargs.get("subaccount_id"),
+            order_types=kwargs.get("order_types"),
+            state=kwargs.get("state"),
+            execution_types=kwargs.get("execution_types")
+        )
+        metadata = await self.load_cookie(type="exchange")
+        return self.stubSpotExchange.StreamOrdersHistory.__call__(req, metadata=metadata)
+
+    async def stream_historical_derivative_orders(self, market_id: str, **kwargs):
+        req = derivative_exchange_rpc_pb.StreamOrdersHistoryRequest(
+            market_id=market_id,
+            direction=kwargs.get("direction"),
+            subaccount_id=kwargs.get("subaccount_id"),
+            order_types=kwargs.get("order_types"),
+            state=kwargs.get("state"),
+            execution_types=kwargs.get("execution_types")
+        )
+        metadata = await self.load_cookie(type="exchange")
+        return self.stubDerivativeExchange.StreamOrdersHistory.__call__(req, metadata=metadata)
+
     async def stream_spot_trades(self, **kwargs):
         req = spot_exchange_rpc_pb.StreamTradesRequest(
             market_id=kwargs.get("market_id"),
@@ -738,7 +763,9 @@ async def get_historical_derivative_orders(self, market_id: str, **kwargs):
             market_id=market_id,
             direction=kwargs.get("direction"),
             order_types=kwargs.get("order_types"),
+            execution_types=kwargs.get("execution_types"),
             subaccount_id=kwargs.get("subaccount_id"),
+            is_conditional=kwargs.get("is_conditional"),
             skip=kwargs.get("skip"),
             limit=kwargs.get("limit"),
             start_time=kwargs.get("start_time"),

setup.py

@@ -17,7 +17,7 @@
 EMAIL = "[email protected]"
 AUTHOR = "Injective Labs"
 REQUIRES_PYTHON = ">=3.7.0"
-VERSION = "0.5.8.4"
+VERSION = "0.5.8.5"
 
 REQUIRED = [
     "grpcio",