(feat) Added methods in AsyncClient and Composer for Exchange V2 queries and messages. Added tests for the deprecated V1 methods. Updated all example scripts related to Exchange module

Author: aarmoa

examples/chain_client/1_LocalOrderHash.py

@@ -41,7 +41,7 @@ async def main() -> None:
     fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
 
     spot_orders = [
-        composer.spot_order(
+        composer.create_v2_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.spot_order(
+        composer.create_v2_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.derivative_order(
+        composer.create_v2_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.derivative_order(
+        composer.create_v2_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(sender=address.to_acc_bech32(), orders=spot_orders)
+    spot_msg = composer.msg_batch_create_spot_limit_orders_v2(sender=address.to_acc_bech32(), orders=spot_orders)
 
-    deriv_msg = composer.msg_batch_create_derivative_limit_orders(
+    deriv_msg = composer.msg_batch_create_derivative_limit_orders_v2(
         sender=address.to_acc_bech32(), orders=derivative_orders
     )
 
@@ -218,9 +218,9 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    spot_msg = composer.msg_batch_create_spot_limit_orders(sender=address.to_acc_bech32(), orders=spot_orders)
+    spot_msg = composer.msg_batch_create_spot_limit_orders_v2(sender=address.to_acc_bech32(), orders=spot_orders)
 
-    deriv_msg = composer.msg_batch_create_derivative_limit_orders(
+    deriv_msg = composer.msg_batch_create_derivative_limit_orders_v2(
         sender=address.to_acc_bech32(), orders=derivative_orders
     )
 

examples/chain_client/2_StreamEventOrderFail.py

@@ -11,8 +11,8 @@ async def main() -> None:
     network = Network.mainnet()
     event_filter = (
         "tm.event='Tx' AND message.sender='inj1rwv4zn3jptsqs7l8lpa3uvzhs57y8duemete9e' "
-        "AND message.action='/injective.exchange.v1beta1.MsgBatchUpdateOrders' "
-        "AND injective.exchange.v1beta1.EventOrderFail.flags EXISTS"
+        "AND message.action='/injective.exchange.v2.MsgBatchUpdateOrders' "
+        "AND injective.exchange.v2.EventOrderFail.flags EXISTS"
     )
     query = json.dumps(
         {
@@ -32,8 +32,8 @@ async def main() -> None:
             if result == {}:
                 continue
 
-            failed_order_hashes = json.loads(result["events"]["injective.exchange.v1beta1.EventOrderFail.hashes"][0])
-            failed_order_codes = json.loads(result["events"]["injective.exchange.v1beta1.EventOrderFail.flags"][0])
+            failed_order_hashes = json.loads(result["events"]["injective.exchange.v2.EventOrderFail.hashes"][0])
+            failed_order_codes = json.loads(result["events"]["injective.exchange.v2.EventOrderFail.flags"][0])
 
             dict = {}
             for i, order_hash in enumerate(failed_order_hashes):

examples/chain_client/3_MessageBroadcaster.py

@@ -35,7 +35,7 @@ async def main() -> None:
     spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
 
     spot_orders_to_create = [
-        composer.spot_order(
+        composer.create_v2_spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -44,7 +44,7 @@ async def main() -> None:
             order_type="BUY",
             cid=(str(uuid.uuid4())),
         ),
-        composer.spot_order(
+        composer.create_v2_spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -56,7 +56,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.msg_batch_update_orders(
+    msg = composer.msg_batch_update_orders_v2(
         sender=address.to_acc_bech32(),
         spot_orders_to_create=spot_orders_to_create,
     )

examples/chain_client/4_MessageBroadcasterWithGranteeAccount.py

@@ -41,7 +41,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(
+    msg = composer.msg_create_spot_limit_order_v2(
         market_id=market_id,
         sender=granter_inj_address,
         subaccount_id=granter_subaccount_id,

examples/chain_client/5_MessageBroadcasterWithoutSimulation.py

@@ -35,7 +35,7 @@ async def main() -> None:
     spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
 
     spot_orders_to_create = [
-        composer.spot_order(
+        composer.create_v2_spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -44,7 +44,7 @@ async def main() -> None:
             order_type="BUY",
             cid=str(uuid.uuid4()),
         ),
-        composer.spot_order(
+        composer.create_v2_spot_order(
             market_id=spot_market_id_create,
             subaccount_id=subaccount_id,
             fee_recipient=fee_recipient,
@@ -56,7 +56,7 @@ async def main() -> None:
     ]
 
     # prepare tx msg
-    msg = composer.msg_batch_update_orders(
+    msg = composer.msg_batch_update_orders_v2(
         sender=address.to_acc_bech32(),
         spot_orders_to_create=spot_orders_to_create,
     )

examples/chain_client/6_MessageBroadcasterWithGranteeAccountWithoutSimulation.py

@@ -40,7 +40,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(
+    msg = composer.msg_create_spot_limit_order_v2(
         market_id=market_id,
         sender=granter_inj_address,
         subaccount_id=granter_subaccount_id,

examples/chain_client/7_ChainStream.py

@@ -31,29 +31,29 @@ async def main() -> None:
     inj_usdt_market = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
     inj_usdt_perp_market = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6"
 
-    bank_balances_filter = composer.chain_stream_bank_balances_filter(
+    bank_balances_filter = composer.chain_stream_bank_balances_v2_filter(
         accounts=["inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"]
     )
-    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_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_ids=["*"], market_ids=[inj_usdt_perp_market]
     )
-    spot_orders_filter = composer.chain_stream_orders_filter(
+    spot_orders_filter = composer.chain_stream_orders_v2_filter(
         subaccount_ids=[subaccount_id], market_ids=[inj_usdt_market]
     )
-    derivative_orders_filter = composer.chain_stream_orders_filter(
+    derivative_orders_filter = composer.chain_stream_orders_v2_filter(
         subaccount_ids=[subaccount_id], market_ids=[inj_usdt_perp_market]
     )
-    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(
+    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(
         subaccount_ids=[subaccount_id], market_ids=[inj_usdt_perp_market]
     )
-    oracle_price_filter = composer.chain_stream_oracle_price_filter(symbols=["INJ", "USDT"])
+    oracle_price_filter = composer.chain_stream_oracle_price_v2_filter(symbols=["INJ", "USDT"])
 
     task = asyncio.get_event_loop().create_task(
-        client.listen_chain_stream_updates(
+        client.listen_chain_stream_v2_updates(
             callback=chain_stream_event_processor,
             on_end_callback=stream_closed_processor,
             on_status_callback=stream_error_processor,

examples/chain_client/authz/1_MsgGrant.py

@@ -38,7 +38,7 @@ async def main() -> None:
     msg = composer.MsgGrantGeneric(
         granter=address.to_acc_bech32(),
         grantee=grantee_public_address,
-        msg_type="/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+        msg_type="/injective.exchange.v2.MsgCreateSpotLimitOrder",
         expire_in=31536000,  # 1 year
     )
 

examples/chain_client/authz/2_MsgExec.py

@@ -38,7 +38,7 @@ async def main() -> None:
 
     granter_address = Address.from_acc_bech32(granter_inj_address)
     granter_subaccount_id = granter_address.get_subaccount_id(index=0)
-    msg0 = composer.msg_create_spot_limit_order(
+    msg0 = composer.msg_create_spot_limit_order_v2(
         sender=granter_inj_address,
         market_id=market_id,
         subaccount_id=granter_subaccount_id,

examples/chain_client/authz/3_MsgRevoke.py

@@ -34,7 +34,7 @@ async def main() -> None:
     msg = composer.MsgRevoke(
         granter=address.to_acc_bech32(),
         grantee=grantee_public_address,
-        msg_type="/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+        msg_type="/injective.exchange.v2.MsgCreateSpotLimitOrder",
     )
 
     # build sim tx