chore: update proto definitions from injective-core master branch (v1.16 candidate)

Author: aarmoa

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.13.4 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.15.6 --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-2
   - git_repo: https://github.com/InjectiveLabs/ibc-go
-    tag: v8.3.2-inj-0
+    tag: v8.7.0-evm-comet1-inj
   - git_repo: https://github.com/InjectiveLabs/wasmd
-    tag: v0.52.0-inj-0
+    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.13.0
 #    subdir: proto
   - git_repo: https://github.com/InjectiveLabs/injective-core
-    branch: feat/add_exchange_v1_compatibility_to_chain_stream
+    branch: master
     subdir: proto
   - directory: proto

pyinjective/composer.py

@@ -863,63 +863,6 @@ def msg_instant_spot_market_launch_v2(
             quote_decimals=quote_decimals,
         )
 
-    def msg_instant_perpetual_market_launch(
-        self,
-        sender: str,
-        ticker: str,
-        quote_denom: str,
-        oracle_base: str,
-        oracle_quote: str,
-        oracle_scale_factor: int,
-        oracle_type: str,
-        maker_fee_rate: Decimal,
-        taker_fee_rate: Decimal,
-        initial_margin_ratio: Decimal,
-        maintenance_margin_ratio: Decimal,
-        min_price_tick_size: Decimal,
-        min_quantity_tick_size: Decimal,
-        min_notional: Decimal,
-    ) -> injective_exchange_tx_pb.MsgInstantPerpetualMarketLaunch:
-        """
-        This method is deprecated and will be removed soon. Please use `msg_instant_perpetual_market_launch_v2` instead
-        """
-        warn(
-            "This method is deprecated. Use msg_instant_perpetual_market_launch_v2 instead",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        quote_token = self.tokens[quote_denom]
-
-        chain_min_price_tick_size = quote_token.chain_formatted_value(min_price_tick_size) * Decimal(
-            f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}"
-        )
-        chain_min_quantity_tick_size = min_quantity_tick_size * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_maker_fee_rate = maker_fee_rate * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_taker_fee_rate = taker_fee_rate * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_initial_margin_ratio = initial_margin_ratio * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_maintenance_margin_ratio = maintenance_margin_ratio * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_min_notional = quote_token.chain_formatted_value(min_notional) * Decimal(
-            f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}"
-        )
-
-        return injective_exchange_tx_pb.MsgInstantPerpetualMarketLaunch(
-            sender=sender,
-            ticker=ticker,
-            quote_denom=quote_token.denom,
-            oracle_base=oracle_base,
-            oracle_quote=oracle_quote,
-            oracle_scale_factor=oracle_scale_factor,
-            oracle_type=injective_oracle_pb.OracleType.Value(oracle_type),
-            maker_fee_rate=f"{chain_maker_fee_rate.normalize():f}",
-            taker_fee_rate=f"{chain_taker_fee_rate.normalize():f}",
-            initial_margin_ratio=f"{chain_initial_margin_ratio.normalize():f}",
-            maintenance_margin_ratio=f"{chain_maintenance_margin_ratio.normalize():f}",
-            min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
-            min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
-            min_notional=f"{chain_min_notional.normalize():f}",
-        )
-
     def msg_instant_perpetual_market_launch_v2(
         self,
         sender: str,
@@ -962,66 +905,6 @@ def msg_instant_perpetual_market_launch_v2(
             min_notional=f"{chain_min_notional.normalize():f}",
         )
 
-    def msg_instant_expiry_futures_market_launch(
-        self,
-        sender: str,
-        ticker: str,
-        quote_denom: str,
-        oracle_base: str,
-        oracle_quote: str,
-        oracle_scale_factor: int,
-        oracle_type: str,
-        expiry: int,
-        maker_fee_rate: Decimal,
-        taker_fee_rate: Decimal,
-        initial_margin_ratio: Decimal,
-        maintenance_margin_ratio: Decimal,
-        min_price_tick_size: Decimal,
-        min_quantity_tick_size: Decimal,
-        min_notional: Decimal,
-    ) -> injective_exchange_tx_pb.MsgInstantPerpetualMarketLaunch:
-        """
-        This method is deprecated and will be removed soon.
-        Please use `msg_instant_expiry_futures_market_launch_v2` instead
-        """
-        warn(
-            "This method is deprecated. Use msg_instant_expiry_futures_market_launch_v2 instead",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        quote_token = self.tokens[quote_denom]
-
-        chain_min_price_tick_size = quote_token.chain_formatted_value(min_price_tick_size) * Decimal(
-            f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}"
-        )
-        chain_min_quantity_tick_size = min_quantity_tick_size * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_maker_fee_rate = maker_fee_rate * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_taker_fee_rate = taker_fee_rate * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_initial_margin_ratio = initial_margin_ratio * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_maintenance_margin_ratio = maintenance_margin_ratio * Decimal(f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}")
-        chain_min_notional = quote_token.chain_formatted_value(min_notional) * Decimal(
-            f"1e{ADDITIONAL_CHAIN_FORMAT_DECIMALS}"
-        )
-
-        return injective_exchange_tx_pb.MsgInstantExpiryFuturesMarketLaunch(
-            sender=sender,
-            ticker=ticker,
-            quote_denom=quote_token.denom,
-            oracle_base=oracle_base,
-            oracle_quote=oracle_quote,
-            oracle_scale_factor=oracle_scale_factor,
-            oracle_type=injective_oracle_pb.OracleType.Value(oracle_type),
-            expiry=expiry,
-            maker_fee_rate=f"{chain_maker_fee_rate.normalize():f}",
-            taker_fee_rate=f"{chain_taker_fee_rate.normalize():f}",
-            initial_margin_ratio=f"{chain_initial_margin_ratio.normalize():f}",
-            maintenance_margin_ratio=f"{chain_maintenance_margin_ratio.normalize():f}",
-            min_price_tick_size=f"{chain_min_price_tick_size.normalize():f}",
-            min_quantity_tick_size=f"{chain_min_quantity_tick_size.normalize():f}",
-            min_notional=f"{chain_min_notional.normalize():f}",
-        )
-
     def msg_instant_expiry_futures_market_launch_v2(
         self,
         sender: str,
@@ -1590,7 +1473,7 @@ def msg_instant_binary_options_market_launch(
         min_price_tick_size: Decimal,
         min_quantity_tick_size: Decimal,
         min_notional: Decimal,
-    ) -> injective_exchange_tx_pb.MsgInstantPerpetualMarketLaunch:
+    ) -> injective_exchange_tx_pb.MsgInstantBinaryOptionsMarketLaunch:
         """
         This method is deprecated and will be removed soon.
         Please use `msg_instant_binary_options_market_launch_v2` instead