"wip : change makefile + pull from betaTrading core"

Author: enigmarikki

Makefile

@@ -2,14 +2,18 @@ all:
 
 gen: gen-client
 
-gen-client: clone-all copy-proto
+gen-client:
+	git clone --depth 1 --branch v1.13.2 https://github.com/InjectiveLabs/injective-core
+	mkdir -p proto
+	
+	cp -r injective-core/proto/* proto/
 	mkdir -p ./pyinjective/proto
 	buf generate --template buf.gen.yaml
 	rm -rf 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 gogoproto cosmos_proto cosmos testpb ibc amino tendermint injective
 
 fix-generated-proto-imports:
 	@touch pyinjective/proto/__init__.py
@@ -29,17 +33,6 @@ endef
 
 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
-
-clone-all: clone-injective-indexer
-
-copy-proto:
-	rm -rf pyinjective/proto
-	mkdir -p proto/exchange
-	find ./injective-indexer/api/gen/grpc -type f -name "*.proto" -exec cp {} ./proto/exchange/ \;
-
 tests:
 	poetry run pytest -v
 

buf.gen.yaml

@@ -21,7 +21,7 @@ inputs:
 #    branch: v0.51.x-inj
 #    subdir: proto
   - git_repo: https://github.com/InjectiveLabs/injective-core
-    tag: v1.13.0
+    tag: v1.13.2
     subdir: proto
 #  - git_repo: https://github.com/InjectiveLabs/injective-core
 #    branch: master

pyinjective/async_client.py

@@ -98,7 +98,7 @@ def __init__(
         self.timeout_height = 1
 
         # exchange stubs
-        
+
         self.chain_stream_channel = self.network.create_chain_stream_grpc_channel()
         self.chain_stream_stub = stream_rpc_grpc.StreamStub(channel=self.chain_stream_channel)
 
@@ -174,68 +174,6 @@ def __init__(
             cookie_assistant=network.chain_cookie_assistant,
         )
 
-        # self.exchange_account_api = IndexerGrpcAccountApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_auction_api = IndexerGrpcAuctionApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_derivative_api = IndexerGrpcDerivativeApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_insurance_api = IndexerGrpcInsuranceApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_meta_api = IndexerGrpcMetaApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_oracle_api = IndexerGrpcOracleApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_portfolio_api = IndexerGrpcPortfolioApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_spot_api = IndexerGrpcSpotApi(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # 
-        # self.exchange_account_stream_api = IndexerGrpcAccountStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_auction_stream_api = IndexerGrpcAuctionStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_derivative_stream_api = IndexerGrpcDerivativeStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_meta_stream_api = IndexerGrpcMetaStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_oracle_stream_api = IndexerGrpcOracleStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_portfolio_stream_api = IndexerGrpcPortfolioStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-        # self.exchange_spot_stream_api = IndexerGrpcSpotStream(
-        #     channel=self.exchange_channel,
-        #     cookie_assistant=network.exchange_cookie_assistant,
-        # )
-
     async def all_tokens(self) -> Dict[str, Token]:
         if self._tokens_by_symbol is None:
             async with self._tokens_and_markets_initialization_lock:
@@ -835,9 +773,7 @@ async def fetch_subaccount_position_in_market(self, subaccount_id: str, market_i
             market_id=market_id,
         )
 
-    async def fetch_subaccount_effective_position_in_market(
-        self, subaccount_id: str, market_id: str
-    ) -> Dict[str, Any]:
+    async def fetch_subaccount_effective_position_in_market(self, subaccount_id: str, market_id: str) -> Dict[str, Any]:
         return await self.chain_exchange_api.fetch_subaccount_effective_position_in_market(
             subaccount_id=subaccount_id,
             market_id=market_id,
@@ -1118,11 +1054,9 @@ async def fetch_spot_markets(
     async def fetch_spot_orderbook(self, market_id: str) -> Dict[str, Any]:
         return await self.chain_exchange_api.fetch_orderbook_v2(market_id=market_id)
 
-
-
     # DerivativeRPC
     ####MASSIVE TODO : NEED TO WRITE A LIQUIDABLE POSITIONS WATCHER#######
-    #async def get_derivative_liquidable_positions(self, **kwargs):
+    # async def get_derivative_liquidable_positions(self, **kwargs):
     #    """
     #    This method is deprecated and will be removed soon. Please use `fetch_derivative_liquidable_positions` instead
     #    """
@@ -1138,16 +1072,16 @@ async def fetch_spot_orderbook(self, market_id: str) -> Dict[str, Any]:
     #    )
     #    return await self.stubDerivativeExchange.LiquidablePositions(req)
 
-    #async def fetch_derivative_liquidable_positions(
+    # async def fetch_derivative_liquidable_positions(
     #    self,
     #    market_id: Optional[str] = None,
     #    pagination: Optional[PaginationOption] = None,
-    #) -> Dict[str, Any]:
+    # ) -> Dict[str, Any]:
     #    return await self.exchange_derivative_api.fetch_liquidable_positions(
     #        market_id=market_id,
     #        pagination=pagination,
     #    )
-   # PortfolioRPC
+    # PortfolioRPC
     async def chain_stream(
         self,
         bank_balances_filter: Optional[chain_stream_query.BankBalancesFilter] = None,
@@ -1501,9 +1435,7 @@ async def _initialize_tokens_and_markets(self):
 
             spot_markets[market.id] = market
 
-        markets_info = (await self.fetch_derivative_markets(status="Active", with_mid_price_and_tob=False))[
-            "markets"
-        ]
+        markets_info = (await self.fetch_derivative_markets(status="Active", with_mid_price_and_tob=False))["markets"]
         for market_info in markets_info:
             market = market_info["market"]
             quote_token = self._tokens_by_denom.get(market["quoteDenom"])
@@ -1566,9 +1498,11 @@ async def _initialize_tokens_and_markets(self):
                     Decimal(market_info["minQuantityTickSize"])
                 ),
                 min_notional=Token.convert_value_from_extended_decimal_format(Decimal(market_info["minNotional"])),
-                settlement_price=None
-                if market_info["settlementPrice"] == ""
-                else Token.convert_value_from_extended_decimal_format(Decimal(market_info["settlementPrice"])),
+                settlement_price=(
+                    None
+                    if market_info["settlementPrice"] == ""
+                    else Token.convert_value_from_extended_decimal_format(Decimal(market_info["settlementPrice"]))
+                ),
             )
 
             binary_option_markets[market.id] = market

pyinjective/composer.py

@@ -937,7 +937,7 @@ def MsgPrivilegedExecuteContract(
             sender=sender,
             contract_address=contract,
             data=msg,
-            funds=kwargs.get("funds")  # funds is a string of Coin strings, comma separated,
+            funds=kwargs.get("funds"),  # funds is a string of Coin strings, comma separated,
             # e.g. 100000inj,20000000000usdt
         )
 
@@ -2105,7 +2105,7 @@ def MsgExecuteContract(self, sender: str, contract: str, msg: str, **kwargs):
             sender=sender,
             contract=contract,
             msg=bytes(msg, "utf-8"),
-            funds=kwargs.get("funds")  # funds is a list of base_coin_pb.Coin.
+            funds=kwargs.get("funds"),  # funds is a list of base_coin_pb.Coin.
             # The coins in the list must be sorted in alphabetical order by denoms.
         )
 

pyinjective/core/broadcaster.py

@@ -18,22 +18,18 @@
 class BroadcasterAccountConfig(ABC):
     @property
     @abstractmethod
-    def trading_injective_address(self) -> str:
-        ...
+    def trading_injective_address(self) -> str: ...
 
     @property
     @abstractmethod
-    def trading_private_key(self) -> PrivateKey:
-        ...
+    def trading_private_key(self) -> PrivateKey: ...
 
     @property
     @abstractmethod
-    def trading_public_key(self) -> PublicKey:
-        ...
+    def trading_public_key(self) -> PublicKey: ...
 
     @abstractmethod
-    def messages_prepared_for_transaction(self, messages: List[any_pb2.Any]) -> List[any_pb2.Any]:
-        ...
+    def messages_prepared_for_transaction(self, messages: List[any_pb2.Any]) -> List[any_pb2.Any]: ...
 
 
 class TransactionFeeCalculator(ABC):
@@ -45,8 +41,7 @@ async def configure_gas_fee_for_transaction(
         transaction: Transaction,
         private_key: PrivateKey,
         public_key: PublicKey,
-    ):
-        ...
+    ): ...
 
 
 class MsgBroadcasterWithPk:

pyinjective/core/gas_limit_estimator.py

@@ -27,8 +27,7 @@ class GasLimitEstimator(ABC):
 
     @classmethod
     @abstractmethod
-    def applies_to(cls, message: any_pb2.Any) -> bool:
-        ...
+    def applies_to(cls, message: any_pb2.Any) -> bool: ...
 
     @classmethod
     def for_message(cls, message: any_pb2.Any):
@@ -48,8 +47,7 @@ def for_message(cls, message: any_pb2.Any):
         return estimator
 
     @abstractmethod
-    def gas_limit(self) -> int:
-        ...
+    def gas_limit(self) -> int: ...
 
     @staticmethod
     def message_type(message: any_pb2.Any) -> str:
@@ -60,8 +58,7 @@ def message_type(message: any_pb2.Any) -> str:
         return message_type
 
     @abstractmethod
-    def _message_class(self, message: any_pb2.Any):
-        ...
+    def _message_class(self, message: any_pb2.Any): ...
 
     def _parsed_message(self, message: any_pb2.Any) -> any_pb2.Any:
         if isinstance(message, any_pb2.Any):

pyinjective/core/network.py

@@ -11,12 +11,10 @@
 
 class CookieAssistant(ABC):
     @abstractmethod
-    def cookie(self) -> Optional[str]:
-        ...
+    def cookie(self) -> Optional[str]: ...
 
     @abstractmethod
-    async def process_response_metadata(self, grpc_call: Call):
-        ...
+    async def process_response_metadata(self, grpc_call: Call): ...
 
     def metadata(self) -> Metadata:
         cookie = self.cookie()