Merge branch 'master' of https://github.com/InjectiveLabs/sdk-python into master

nhannamsiu · nhannamsiu · commit a270d47ac715 · 2021-12-10T15:05:44.000+07:00
diff --git a/README.md b/README.md
@@ -86,13 +86,20 @@ python pyinjective/fetch_metadata.py
 
 
 ### Changelogs
+0.5.4
+* Added PortfolioRequest, GetTxByHashRequest, AuctionRequest, AuctionsRequest, StreamBidsRequest and provided examples
+* Updated the composer with MsgIncreasePosition and MsgLiquidatePosition
+* Added reduce-only orders to the composer and updated examples
+
+0.5.3
+* add skip, and limit to trade request
+
 0.5.2
-* fix type hints
-* add sync init_num_seq, changed previous init_num_seq to ainit_num_seq
+* add sync init_num_seq, changed previous init_num_seq to async_init_num_seq
 * add staging mainnet endpoint, update market metadata
 * protobuf regen
 * response parser improvements
-
+* fix type hints
 
 0.5.1
 * add AsyncClient
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
@@ -48,17 +48,17 @@ async def main() -> None:
             fee_recipient=fee_recipient,
             price=41027,
             quantity=0.01,
+            is_buy=True,
             leverage=0.7,
-            is_buy=True
         ),
         composer.DerivativeOrder(
             market_id=market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
             price=62140,
             quantity=0.01,
-            leverage=1.4,
-            is_buy=False
+            is_buy=False,
+            is_reduce_only=True
         ),
     ]
 
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
@@ -48,10 +48,11 @@ async def main() -> None:
         market_id=market_id,
         subaccount_id=subaccount_id,
         fee_recipient=fee_recipient,
-        price=44054.48,
-        quantity=0.01,
-        leverage=0.7,
-        is_buy=True
+        price=50000,
+        quantity=0.1,
+        is_buy=False,
+        leverage=1,
+        is_reduce_only=False
     )
 
     # build sim tx
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/examples/exchange_api_examples/accounts_rpc/8_PortfolioRequest.py b/examples/exchange_api_examples/accounts_rpc/8_PortfolioRequest.py
@@ -0,0 +1,32 @@
+# Copyright 2021 Injective Labs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Injective Exchange API client for Python. Example only."""
+
+import asyncio
+import logging
+
+from pyinjective.client import Client
+from pyinjective.constant import Network
+
+
+async def main() -> None:
+    network = Network.testnet()
+    client = Client(network, insecure=True)
+    account_address = "inj14au322k9munkmx5wrchz9q30juf5wjgz2cfqku"
+    portfolio = client.get_portfolio(account_address=account_address)
+    print(portfolio)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    asyncio.get_event_loop().run_until_complete(main())
diff --git a/examples/exchange_api_examples/auctions_rpc/10_Auction.py b/examples/exchange_api_examples/auctions_rpc/10_Auction.py
@@ -0,0 +1,31 @@
+# Copyright 2021 Injective Labs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Injective Exchange API client for Python. Example only."""
+
+import asyncio
+import logging
+
+from pyinjective.client import Client
+from pyinjective.constant import Network
+
+async def main() -> None:
+    network = Network.testnet()
+    client = Client(network, insecure=True)
+    bid_round = 135
+    auction = client.get_auction(bid_round=bid_round)
+    print(auction)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    asyncio.get_event_loop().run_until_complete(main())
diff --git a/examples/exchange_api_examples/auctions_rpc/11_Auctions.py b/examples/exchange_api_examples/auctions_rpc/11_Auctions.py
@@ -0,0 +1,30 @@
+# Copyright 2021 Injective Labs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Injective Exchange API client for Python. Example only."""
+
+import asyncio
+import logging
+
+from pyinjective.client import Client
+from pyinjective.constant import Network
+
+async def main() -> None:
+    network = Network.testnet()
+    client = Client(network, insecure=True)
+    auctions = client.get_auctions()
+    print(auctions)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    asyncio.get_event_loop().run_until_complete(main())
diff --git a/examples/exchange_api_examples/auctions_rpc/9_Streambids.py b/examples/exchange_api_examples/auctions_rpc/9_Streambids.py
@@ -0,0 +1,31 @@
+# Copyright 2021 Injective Labs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Injective Exchange API client for Python. Example only."""
+
+import asyncio
+import logging
+
+from pyinjective.client import Client
+from pyinjective.constant import Network
+
+async def main() -> None:
+    network = Network.testnet()
+    client = Client(network, insecure=True)
+    bids = client.stream_bids()
+    for bid in bids:
+        print(bid)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    asyncio.get_event_loop().run_until_complete(main())
diff --git a/examples/exchange_api_examples/explorer_rpc/1_GetTxByHash.py b/examples/exchange_api_examples/explorer_rpc/1_GetTxByHash.py
@@ -0,0 +1,31 @@
+# Copyright 2021 Injective Labs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Injective Exchange API client for Python. Example only."""
+
+import asyncio
+import logging
+
+from pyinjective.client import Client
+from pyinjective.constant import Network
+
+async def main() -> None:
+    network = Network.testnet()
+    client = Client(network, insecure=True)
+    tx_hash = "0x298c3a789bb53b5978f8140fcfe9ec8a4447211b95618d8b108fcf521625fb1a"
+    account = client.get_tx_by_hash(tx_hash=tx_hash)
+    print(account)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    asyncio.get_event_loop().run_until_complete(main())
diff --git a/pyinjective/async_client.py b/pyinjective/async_client.py
diff --git a/pyinjective/client.py b/pyinjective/client.py
diff --git a/pyinjective/composer.py b/pyinjective/composer.py
diff --git a/pyinjective/proto/exchange/injective_auction_rpc_pb2.py b/pyinjective/proto/exchange/injective_auction_rpc_pb2.py
diff --git a/pyinjective/proto/exchange/injective_auction_rpc_pb2_grpc.py b/pyinjective/proto/exchange/injective_auction_rpc_pb2_grpc.py
diff --git a/pyinjective/proto/exchange/injective_explorer_rpc_pb2.py b/pyinjective/proto/exchange/injective_explorer_rpc_pb2.py
diff --git a/pyinjective/proto/exchange/injective_explorer_rpc_pb2_grpc.py b/pyinjective/proto/exchange/injective_explorer_rpc_pb2_grpc.py
diff --git a/pyinjective/proto/injective/exchange/v1beta1/query_pb2.py b/pyinjective/proto/injective/exchange/v1beta1/query_pb2.py
diff --git a/pyinjective/proto/injective/exchange/v1beta1/query_pb2_grpc.py b/pyinjective/proto/injective/exchange/v1beta1/query_pb2_grpc.py
diff --git a/setup.py b/setup.py
