minor improvements in chain_client examples, add get_order_states, an… (#41)

DrunkenRandomWalker · web-flow · commit 6c865a35bf3f · 2021-11-30T09:51:10.000-05:00
* minor improvements in chain_client examples, add get_order_states, and stream_orderbooks to async_client
diff --git a/examples/chain_client_examples/10_ExchangeMsgBatchCancelDerivativeOrders.py b/examples/chain_client_examples/10_ExchangeMsgBatchCancelDerivativeOrders.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/11_ExchangeMsgBatchCreateSpotLimitOrders.py b/examples/chain_client_examples/11_ExchangeMsgBatchCreateSpotLimitOrders.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/12_ExchangeMsgBatchCreateDerivativeLimitOrders.py b/examples/chain_client_examples/12_ExchangeMsgBatchCreateDerivativeLimitOrders.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/13_ExchangeMsgIncreasePositionMargin.py b/examples/chain_client_examples/13_ExchangeMsgIncreasePositionMargin.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/14_ExchangeMsgLiquidatePosition.py b/examples/chain_client_examples/14_ExchangeMsgLiquidatePosition.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/15_ExchangeMsgWithdraw.py b/examples/chain_client_examples/15_ExchangeMsgWithdraw.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare tx msg
diff --git a/examples/chain_client_examples/16_ExchangeMsgSubaccountTransfer.py b/examples/chain_client_examples/16_ExchangeMsgSubaccountTransfer.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
     dest_subaccount_id = address.get_subaccount_id(index=1)
 
diff --git a/examples/chain_client_examples/17_ExchangeMultipleMsgs.py b/examples/chain_client_examples/17_ExchangeMultipleMsgs.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/18_ExchangeMsgCreateSpotLimitOrder_async.py b/examples/chain_client_examples/18_ExchangeMsgCreateSpotLimitOrder_async.py
@@ -19,7 +19,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/1_CosmosBankMsgSend.py b/examples/chain_client_examples/1_CosmosBankMsgSend.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
 
     # prepare tx msg
     msg = composer.MsgSend(
diff --git a/examples/chain_client_examples/2_ExchangeMsgDeposit.py b/examples/chain_client_examples/2_ExchangeMsgDeposit.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare tx msg
diff --git a/examples/chain_client_examples/3_ExchangeMsgCreateSpotLimitOrder.py b/examples/chain_client_examples/3_ExchangeMsgCreateSpotLimitOrder.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address =  pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/4_ExchangeMsgCreateSpotMarketOrder.py b/examples/chain_client_examples/4_ExchangeMsgCreateSpotMarketOrder.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address =  pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/5_ExchangeMsgCancelSpotOrder.py b/examples/chain_client_examples/5_ExchangeMsgCancelSpotOrder.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/6_ExchangeMsgCreateDerivativeLimitOrder.py b/examples/chain_client_examples/6_ExchangeMsgCreateDerivativeLimitOrder.py
@@ -35,7 +35,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/7_ExchangeMsgCreateDerivativeMarketOrder.py b/examples/chain_client_examples/7_ExchangeMsgCreateDerivativeMarketOrder.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/8_ExchangeMsgCancelDerivativeOrder.py b/examples/chain_client_examples/8_ExchangeMsgCancelDerivativeOrder.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key =  priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/examples/chain_client_examples/9_ExchangeMsgBatchCancelSpotOrders.py b/examples/chain_client_examples/9_ExchangeMsgBatchCancelSpotOrders.py
@@ -34,7 +34,7 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("5d386fbdbf11f1141010f81a46b40f94887367562bd33b452bbaa6ce1cd1381e")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address().init_num_seq(network.lcd_endpoint)
     subaccount_id = address.get_subaccount_id(index=0)
 
     # prepare trade info
diff --git a/pyinjective/async_client.py b/pyinjective/async_client.py
@@ -38,7 +38,6 @@
 
 from .constant import Network
 
-
 class AsyncClient:
     def __init__(
             self,
@@ -182,14 +181,27 @@ async def get_subaccount_order_summary(self, subaccount_id: str, order_direction
         req = exchange_accounts_rpc_pb.SubaccountOrderSummaryRequest(subaccount_id=subaccount_id, order_direction=order_direction, market_id=market_id)
         return await self.stubExchangeAccount.SubaccountOrderSummary(req)
 
+    async def get_order_states(
+        self,
+        spot_order_hashes: List[str] = [""],
+        derivative_order_hashes: List[str] = [""],
+    ):
+        req = exchange_accounts_rpc_pb.OrderStatesRequest(
+            spot_order_hashes=spot_order_hashes,
+            derivative_order_hashes=derivative_order_hashes,
+        )
+        return await self.stubExchangeAccount.OrderStates(req)
+
+
     # OracleRPC
 
     async def stream_oracle_prices(self, base_symbol: str, quote_symbol: str, oracle_type: str):
         req = oracle_rpc_pb.StreamPricesRequest(base_symbol=base_symbol, quote_symbol=quote_symbol, oracle_type=oracle_type)
         return self.stubOracle.StreamPrices(req)
 
-    async def get_oracle_prices(self, base_symbol: str, quote_symbol: str, oracle_type: str, oracle_scale_factor: str):
-        req = oracle_rpc_pb.PriceRequest(base_symbol=base_symbol, quote_symbol=quote_symbol, oracle_type=oracle_type, oracle_scale_factor=oracle_scale_factor)
+    async def get_oracle_prices(self, base_symbol: str, quote_symbol: str, oracle_type: str, oracle_scale_factor: int):
+        req = oracle_rpc_pb.PriceRequest(base_symbol=base_symbol, quote_symbol=quote_symbol, oracle_type=oracle_type,
+                oracle_scale_factor=oracle_scale_factor)
         return await self.stubOracle.Price(req)
 
     async def get_oracle_list(self):
@@ -236,6 +248,11 @@ async def stream_spot_orderbook(self, market_id: str):
         req = spot_exchange_rpc_pb.StreamOrderbookRequest(market_ids=[market_id])
         return self.stubSpotExchange.StreamOrderbook(req)
 
+    async def stream_spot_orderbooks(self, market_ids: List[str]):
+        req = spot_exchange_rpc_pb.StreamOrderbookRequest(market_ids=market_ids)
+        return self.stubSpotExchange.StreamOrderbook(req)
+
+
     async def stream_spot_orders(self, market_id: str, order_side: str = '', subaccount_id: str = ''):
         req = spot_exchange_rpc_pb.StreamOrdersRequest(market_id=market_id, order_side=order_side, subaccount_id=subaccount_id)
         return self.stubSpotExchange.StreamOrders(req)
@@ -282,6 +299,10 @@ async def stream_derivative_orderbook(self, market_id: str):
         req = derivative_exchange_rpc_pb.StreamOrderbookRequest(market_ids=[market_id])
         return self.stubDerivativeExchange.StreamOrderbook(req)
 
+    async def stream_derivative_orderbooks(self, market_ids: List[str]):
+        req = derivative_exchange_rpc_pb.StreamOrderbookRequest(market_ids=market_ids)
+        return self.stubDerivativeExchange.StreamOrderbook(req)
+
     async def stream_derivative_orders(self, market_id: str, order_side: str = '', subaccount_id: str = ''):
         req = derivative_exchange_rpc_pb.StreamOrdersRequest(market_id=market_id, order_side=order_side, subaccount_id=subaccount_id)
         return self.stubDerivativeExchange.StreamOrders(req)
diff --git a/pyinjective/client.py b/pyinjective/client.py
@@ -254,7 +254,7 @@ def get_oracle_prices(
             base_symbol=base_symbol,
             quote_symbol=quote_symbol,
             oracle_type=oracle_type,
-            oracle_scale_factor=str(oracle_scale_factor),
+            oracle_scale_factor=oracle_scale_factor,
         )
         return self.stubOracle.Price(req)
 
