Merge pull request #354 from InjectiveLabs/feat/add_support_exchange_v2

Feat/add support exchange v2

Author: aarmoa

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - 9999-99-99
+### Added
+- Added support for Exchange V2 proto queries and types
+- Updated all chain exchange module examples to use the new Exchange V2 proto queries and types
+
+### Removed
+- Removed all methods marked as deprecated in AsyncClient and Composer
 
 ## [1.10.0] - 2025-04-16
 ### Added

Makefile

@@ -9,7 +9,7 @@ gen-client: clone-all copy-proto
 	$(call clean_repos)
 	$(MAKE) fix-generated-proto-imports
 
-PROTO_MODULES := cosmwasm exchange gogoproto cosmos_proto cosmos testpb ibc amino tendermint injective
+PROTO_MODULES := cosmwasm exchange gogoproto cosmos_proto cosmos testpb ibc amino tendermint cometbft injective
 
 fix-generated-proto-imports:
 	@touch pyinjective/proto/__init__.py
@@ -31,7 +31,7 @@ clean-all:
 	$(call clean_repos)
 
 clone-injective-indexer:
-	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.15.6 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.16.0-rc2 --depth 1 --single-branch
 
 clone-all: clone-injective-indexer
 

buf.gen.yaml

@@ -11,19 +11,21 @@ inputs:
   - module: buf.build/cosmos/gogo-proto
   - module: buf.build/googleapis/googleapis
   - module: buf.build/cosmos/ics23
-  - git_repo: https://github.com/InjectiveLabs/cosmos-sdk
-    tag: v0.50.9-inj.5
   - git_repo: https://github.com/InjectiveLabs/ibc-go
-    tag: v8.7.0-inj
+    tag: v8.7.0-evm-comet1-inj
   - git_repo: https://github.com/InjectiveLabs/wasmd
-    tag: v0.53.2-inj.2
+    tag: v0.53.2-evm-comet1-inj
+  - git_repo: https://github.com/InjectiveLabs/cometbft
+    tag: v1.0.1-inj
+  - git_repo: https://github.com/InjectiveLabs/cosmos-sdk
+    tag: v0.50.13-evm-comet1-inj.2
 #  - git_repo: https://github.com/InjectiveLabs/wasmd
 #    branch: v0.51.x-inj
 #    subdir: proto
   - git_repo: https://github.com/InjectiveLabs/injective-core
-    tag: v1.15.0
+    tag: v1.16.0-beta.2
     subdir: proto
 #  - git_repo: https://github.com/InjectiveLabs/injective-core
-#    branch: release/v1.15.x
+#    branch: master
 #    subdir: proto
   - directory: proto

examples/chain_client/1_LocalOrderHash.py

@@ -41,7 +41,7 @@ async def main() -> None:
     fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
 
     spot_orders = [
-        composer.spot_order(
+        composer.create_spot_order_v2(
             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_spot_order_v2(
             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_derivative_order_v2(
             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_derivative_order_v2(
             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
     )
 
@@ -178,7 +178,7 @@ async def main() -> None:
     print("gas fee: {} INJ".format(gas_fee))
 
     spot_orders = [
-        composer.spot_order(
+        composer.create_spot_order_v2(
             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.spot_order(
+        composer.create_spot_order_v2(
             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.derivative_order(
+        composer.create_derivative_order_v2(
             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.derivative_order(
+        composer.create_derivative_order_v2(
             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(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

@@ -45,7 +45,7 @@ async def main() -> None:
     spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
 
     spot_orders_to_create = [
-        composer.spot_order(
+        composer.create_spot_order_v2(
             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.spot_order(
+        composer.create_spot_order_v2(
             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(
+    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

@@ -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(
+    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

@@ -46,7 +46,7 @@ async def main() -> None:
     spot_market_id_create = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
 
     spot_orders_to_create = [
-        composer.spot_order(
+        composer.create_spot_order_v2(
             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.spot_order(
+        composer.create_spot_order_v2(
             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(
+    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

@@ -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(
+    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

examples/chain_client/authz/query/1_Grants.py

@@ -14,7 +14,7 @@ async def main() -> None:
 
     network = Network.testnet()
     client = AsyncClient(network)
-    msg_type_url = "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder"
+    msg_type_url = "/injective.exchange.v2.MsgCreateDerivativeLimitOrder"
     authorizations = await client.fetch_grants(granter=granter, grantee=grantee, msg_type_url=msg_type_url)
     print(authorizations)
 

examples/chain_client/bank/1_MsgSend.py

@@ -30,11 +30,11 @@ async def main() -> None:
     await client.fetch_account(address.to_acc_bech32())
 
     # prepare tx msg
-    msg = composer.MsgSend(
+    msg = composer.msg_send(
         from_address=address.to_acc_bech32(),
         to_address="inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r",
-        amount=0.000000000000000001,
-        denom="INJ",
+        amount=1,
+        denom="inj",
     )
 
     # build sim tx

examples/chain_client/exchange/10_MsgCreateDerivativeLimitOrder.py

@@ -37,7 +37,7 @@ async def main() -> None:
     fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
 
     # prepare tx msg
-    msg = composer.msg_create_derivative_limit_order(
+    msg = composer.msg_create_derivative_limit_order_v2(
         sender=address.to_acc_bech32(),
         market_id=market_id,
         subaccount_id=subaccount_id,

examples/chain_client/exchange/11_MsgCreateDerivativeMarketOrder.py

@@ -37,7 +37,7 @@ async def main() -> None:
     fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
 
     # prepare tx msg
-    msg = composer.msg_create_derivative_market_order(
+    msg = composer.msg_create_derivative_market_order_v2(
         sender=address.to_acc_bech32(),
         market_id=market_id,
         subaccount_id=subaccount_id,

examples/chain_client/exchange/12_MsgCancelDerivativeOrder.py

@@ -35,8 +35,14 @@ async def main() -> None:
     order_hash = "0x667ee6f37f6d06bf473f4e1434e92ac98ff43c785405e2a511a0843daeca2de9"
 
     # prepare tx msg
-    msg = composer.msg_cancel_derivative_order(
-        sender=address.to_acc_bech32(), market_id=market_id, subaccount_id=subaccount_id, order_hash=order_hash
+    msg = composer.msg_cancel_derivative_order_v2(
+        sender=address.to_acc_bech32(),
+        market_id=market_id,
+        subaccount_id=subaccount_id,
+        order_hash=order_hash,
+        is_buy=True,
+        is_market_order=False,
+        is_conditional=False,
     )
 
     # build sim tx

examples/chain_client/exchange/13_MsgInstantBinaryOptionsMarketLaunch.py

@@ -41,7 +41,7 @@ async def main() -> None:
     await client.fetch_account(address.to_acc_bech32())
 
     # prepare tx msg
-    message = composer.msg_instant_binary_options_market_launch(
+    message = composer.msg_instant_binary_options_market_launch_v2(
         sender=address.to_acc_bech32(),
         ticker="UFC-KHABIB-TKO-05/30/2023",
         oracle_symbol="UFC-KHABIB-TKO-05/30/2023",