(feat) Created a new Composer and a new AsyncClient to support exchange v2 endpoints. The original Composer and AsyncClient are still supported. Created an IndexerClient for all indexer endpoints

Author: aarmoa

.gitignore

@@ -145,3 +145,4 @@ cython_debug/
 .exchange_cookie
 
 .flakeheaven_cache
+.vscode/settings.json

CHANGELOG.md

@@ -10,6 +10,9 @@ All notable changes to this project will be documented in this file.
 - Updated all chain exchange module examples to use the new Exchange V2 proto queries and types
 - Added examples for ERC20 queries and messages
 - Added examples for EVM queries
+- Created a new AsyncClient in the pyinjective.async_client_v2 module. This new AsyncClient provides support for the newe v2 exchange endpoints. AsyncClient in pyinjective.async_client module still provides access to the v1 exchange endpoints.
+- Created a new Composer in the pyinjective.composer_v2 module. This new Composer provides support to create exchange v2 objects. Composer in pyinjective.composer module still provides access to the v1 exchange objects.
+- Created the IndexerClient class to have all indexer queries. AsyncClient v2 now does not include any logic related to the indexer endpoints. The original AsyncClient still does support indexer endpoints (for backwards compatibility) but it does that by using an instance of the IndexerClient
 
 ### Removed
 - Removed all methods marked as deprecated in AsyncClient and Composer

examples/chain_client/1_LocalOrderHash.py

@@ -5,7 +5,7 @@
 
 import dotenv
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.constant import GAS_FEE_BUFFER_AMOUNT
 from pyinjective.core.network import Network
 from pyinjective.orderhash import OrderHashManager
@@ -41,7 +41,7 @@ async def main() -> None:
     fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
 
     spot_orders = [
-        composer.create_spot_order_v2(
+        composer.spot_order(
             market_id=spot_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -50,7 +50,7 @@ async def main() -> None:
             order_type="BUY",
             cid=str(uuid.uuid4()),
         ),
-        composer.create_spot_order_v2(
+        composer.spot_order(
             market_id=spot_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -62,7 +62,7 @@ async def main() -> None:
     ]
 
     derivative_orders = [
-        composer.create_derivative_order_v2(
+        composer.derivative_order(
             market_id=deriv_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -74,7 +74,7 @@ async def main() -> None:
             order_type="BUY",
             cid=str(uuid.uuid4()),
         ),
-        composer.create_derivative_order_v2(
+        composer.derivative_order(
             market_id=deriv_market_id,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -89,9 +89,9 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    spot_msg = composer.msg_batch_create_spot_limit_orders_v2(sender=address.to_acc_bech32(), orders=spot_orders)
+    spot_msg = composer.msg_batch_create_spot_limit_orders(sender=address.to_acc_bech32(), orders=spot_orders)
 
-    deriv_msg = composer.msg_batch_create_derivative_limit_orders_v2(
+    deriv_msg = composer.msg_batch_create_derivative_limit_orders(
         sender=address.to_acc_bech32(), orders=derivative_orders
     )
 
@@ -178,7 +178,7 @@ async def main() -> None:
     print("gas fee: {} INJ".format(gas_fee))
 
     spot_orders = [
-        composer.create_spot_order_v2(
+        composer.spot_order(
             market_id=spot_market_id,
             subaccount_id=subaccount_id_2,
             fee_recipient=fee_recipient,
@@ -187,7 +187,7 @@ async def main() -> None:
             order_type="BUY_PO",
             cid=str(uuid.uuid4()),
         ),
-        composer.create_spot_order_v2(
+        composer.spot_order(
             market_id=spot_market_id,
             subaccount_id=subaccount_id_2,
             fee_recipient=fee_recipient,
@@ -199,7 +199,7 @@ async def main() -> None:
     ]
 
     derivative_orders = [
-        composer.create_derivative_order_v2(
+        composer.derivative_order(
             market_id=deriv_market_id,
             subaccount_id=subaccount_id_2,
             fee_recipient=fee_recipient,
@@ -211,7 +211,7 @@ async def main() -> None:
             order_type="BUY",
             cid=str(uuid.uuid4()),
         ),
-        composer.create_derivative_order_v2(
+        composer.derivative_order(
             market_id=deriv_market_id,
             subaccount_id=subaccount_id_2,
             fee_recipient=fee_recipient,
@@ -226,9 +226,9 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    spot_msg = composer.msg_batch_create_spot_limit_orders_v2(sender=address.to_acc_bech32(), orders=spot_orders)
+    spot_msg = composer.msg_batch_create_spot_limit_orders(sender=address.to_acc_bech32(), orders=spot_orders)
 
-    deriv_msg = composer.msg_batch_create_derivative_limit_orders_v2(
+    deriv_msg = composer.msg_batch_create_derivative_limit_orders(
         sender=address.to_acc_bech32(), orders=derivative_orders
     )
 

examples/chain_client/3_MessageBroadcaster.py

@@ -6,7 +6,7 @@
 
 import dotenv
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.core.broadcaster import MsgBroadcasterWithPk
 from pyinjective.core.network import Network
 from pyinjective.wallet import PrivateKey
@@ -45,7 +45,7 @@ async def main() -> None:
     spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
 
     spot_orders_to_create = [
-        composer.create_spot_order_v2(
+        composer.spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -54,7 +54,7 @@ async def main() -> None:
             order_type="BUY",
             cid=(str(uuid.uuid4())),
         ),
-        composer.create_spot_order_v2(
+        composer.spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -66,7 +66,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.msg_batch_update_orders_v2(
+    msg = composer.msg_batch_update_orders(
         sender=address.to_acc_bech32(),
         spot_orders_to_create=spot_orders_to_create,
     )

examples/chain_client/4_MessageBroadcasterWithGranteeAccount.py

@@ -6,7 +6,7 @@
 
 import dotenv
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.core.broadcaster import MsgBroadcasterWithPk
 from pyinjective.core.network import Network
 from pyinjective.wallet import Address, PrivateKey
@@ -48,7 +48,7 @@ async def main() -> None:
     granter_address = Address.from_acc_bech32(granter_inj_address)
     granter_subaccount_id = granter_address.get_subaccount_id(index=0)
 
-    msg = composer.msg_create_spot_limit_order_v2(
+    msg = composer.msg_create_spot_limit_order(
         market_id=market_id,
         sender=granter_inj_address,
         subaccount_id=granter_subaccount_id,

examples/chain_client/5_MessageBroadcasterWithoutSimulation.py

@@ -6,7 +6,7 @@
 
 import dotenv
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.core.broadcaster import MsgBroadcasterWithPk
 from pyinjective.core.network import Network
 from pyinjective.wallet import PrivateKey
@@ -46,7 +46,7 @@ async def main() -> None:
     spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
 
     spot_orders_to_create = [
-        composer.create_spot_order_v2(
+        composer.composer.spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -55,7 +55,7 @@ async def main() -> None:
             order_type="BUY",
             cid=str(uuid.uuid4()),
         ),
-        composer.create_spot_order_v2(
+        composer.composer.spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -67,7 +67,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.msg_batch_update_orders_v2(
+    msg = composer.msg_batch_update_orders(
         sender=address.to_acc_bech32(),
         spot_orders_to_create=spot_orders_to_create,
     )

examples/chain_client/6_MessageBroadcasterWithGranteeAccountWithoutSimulation.py

@@ -6,7 +6,7 @@
 
 import dotenv
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.core.broadcaster import MsgBroadcasterWithPk
 from pyinjective.core.network import Network
 from pyinjective.wallet import Address, PrivateKey
@@ -46,7 +46,7 @@ async def main() -> None:
     granter_address = Address.from_acc_bech32(granter_inj_address)
     granter_subaccount_id = granter_address.get_subaccount_id(index=0)
 
-    msg = composer.msg_create_spot_limit_order_v2(
+    msg = composer.msg_create_spot_limit_order(
         market_id=market_id,
         sender=granter_inj_address,
         subaccount_id=granter_subaccount_id,

examples/chain_client/7_ChainStream.py

@@ -3,8 +3,7 @@
 
 from grpc import RpcError
 
-from pyinjective.async_client import AsyncClient
-from pyinjective.composer import Composer
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.core.network import Network
 
 
@@ -24,36 +23,36 @@ async def main() -> None:
     network = Network.testnet()
 
     client = AsyncClient(network)
-    composer = Composer(network=network.string())
+    composer = await client.composer()
 
     subaccount_id = "0xbdaedec95d563fb05240d6e01821008454c24c36000000000000000000000000"
 
     inj_usdt_market = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
     inj_usdt_perp_market = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6"
 
-    bank_balances_filter = composer.chain_stream_bank_balances_v2_filter(
+    bank_balances_filter = composer.chain_stream_bank_balances_filter(
         accounts=["inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"]
     )
-    subaccount_deposits_filter = composer.chain_stream_subaccount_deposits_v2_filter(subaccount_ids=[subaccount_id])
-    spot_trades_filter = composer.chain_stream_trades_v2_filter(subaccount_ids=["*"], market_ids=[inj_usdt_market])
-    derivative_trades_filter = composer.chain_stream_trades_v2_filter(
+    subaccount_deposits_filter = composer.chain_stream_subaccount_deposits_filter(subaccount_ids=[subaccount_id])
+    spot_trades_filter = composer.chain_stream_trades_filter(subaccount_ids=["*"], market_ids=[inj_usdt_market])
+    derivative_trades_filter = composer.chain_stream_trades_filter(
         subaccount_ids=["*"], market_ids=[inj_usdt_perp_market]
     )
-    spot_orders_filter = composer.chain_stream_orders_v2_filter(
+    spot_orders_filter = composer.chain_stream_orders_filter(
         subaccount_ids=[subaccount_id], market_ids=[inj_usdt_market]
     )
-    derivative_orders_filter = composer.chain_stream_orders_v2_filter(
+    derivative_orders_filter = composer.chain_stream_orders_filter(
         subaccount_ids=[subaccount_id], market_ids=[inj_usdt_perp_market]
     )
-    spot_orderbooks_filter = composer.chain_stream_orderbooks_v2_filter(market_ids=[inj_usdt_market])
-    derivative_orderbooks_filter = composer.chain_stream_orderbooks_v2_filter(market_ids=[inj_usdt_perp_market])
-    positions_filter = composer.chain_stream_positions_v2_filter(
+    spot_orderbooks_filter = composer.chain_stream_orderbooks_filter(market_ids=[inj_usdt_market])
+    derivative_orderbooks_filter = composer.chain_stream_orderbooks_filter(market_ids=[inj_usdt_perp_market])
+    positions_filter = composer.chain_stream_positions_filter(
         subaccount_ids=[subaccount_id], market_ids=[inj_usdt_perp_market]
     )
-    oracle_price_filter = composer.chain_stream_oracle_price_v2_filter(symbols=["INJ", "USDT"])
+    oracle_price_filter = composer.chain_stream_oracle_price_filter(symbols=["INJ", "USDT"])
 
     task = asyncio.get_event_loop().create_task(
-        client.listen_chain_stream_v2_updates(
+        client.listen_chain_stream_updates(
             callback=chain_stream_event_processor,
             on_end_callback=stream_closed_processor,
             on_status_callback=stream_error_processor,

examples/chain_client/9_PaginatedRequestExample.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.client.model.pagination import PaginationOption
 from pyinjective.core.network import Network
 

examples/chain_client/auction/1_MsgBid.py

@@ -4,7 +4,7 @@
 import dotenv
 from grpc import RpcError
 
-from pyinjective.async_client import AsyncClient
+from pyinjective.async_client_v2 import AsyncClient
 from pyinjective.constant import GAS_FEE_BUFFER_AMOUNT
 from pyinjective.core.network import Network
 from pyinjective.transaction import Transaction
@@ -30,7 +30,7 @@ async def main() -> None:
     await client.fetch_account(address.to_acc_bech32())
 
     # prepare tx msg
-    msg = composer.MsgBid(sender=address.to_acc_bech32(), round=16250, bid_amount=1)
+    msg = composer.msg_bid(sender=address.to_acc_bech32(), round=16250, bid_amount=1)
 
     # build sim tx
     tx = (