Merge branch 'dev' of https://github.com/InjectiveLabs/sdk-python into feat/refactor_markets_and_tokens

Author: abel

Makefile

@@ -21,7 +21,7 @@ copy-proto:
 	mkdir -p proto/exchange
 	buf export buf.build/cosmos/cosmos-sdk:v0.47.0 --output=third_party
 	buf export https://github.com/cosmos/ibc-go.git --exclude-imports --output=third_party
-	buf export https://github.com/tendermint/tendermint.git --exclude-imports --output=third_party
+	buf export https://github.com/cometbft/cometbft.git --exclude-imports --output=third_party
 	buf export https://github.com/CosmWasm/wasmd.git --exclude-imports --output=./third_party
 	buf export https://github.com/cosmos/ics23.git --exclude-imports --output=./third_party
 

Pipfile.lock

@@ -87,18 +87,27 @@ make tests
 ```
 
 ### Changelogs
-**0.7**(change before release)
+**0.7.1**(change before release)
 * Refactor Composer to be created with all the markets and tokens. The Composer now uses the real markets and tokens to convert human-readable values to chain format
 * The Composer can still be instantiated without markets and tokens. When markets and tokens are not provided the Composer loads the required information from the Denoms used in previous versions
 * Change in AsyncClient to be able to create Composer instances for the client network, markets and tokens
 * Examples have been adapted to create Composer instances using the AsyncClient
 
+**0.7**
+* Removed references to pysha3 library (and also eip712-struct that required it) and replaced it with other implementation to allow the project to work with Python 3.11
+* Updated sentry nodes LCD URL, for each sentry node to use its own service
+
+**0.6.5**
+* Removed `k8s` from the list of supported mainnet nodes (`lb` should be used instead)
+
 **0.6.4**
 * Change logging logic to use different loggers for each module and class
 * Solved issue preventing requesting spot and derivative historical orders for more than one market_id
-* Removed references to pysha3 library (and also eip712-struct that required it) and replaced it with other implementation to allow the project to work with Python 3.11
 * Add `pytest` as a development dependency to implement and run unit tests
 
+**0.6.3.3**
+* Update the code to the new structure of transaction responses
+
 **0.6.3.1**
 * Update the code to the new structure of transaction simulation responses
 

README.md

@@ -2,15 +2,22 @@
 import logging
 
 from pyinjective.async_client import AsyncClient
+from pyinjective.composer import Composer
 from pyinjective.constant import Network
 
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
     client = AsyncClient(network, insecure=False)
+    composer = Composer(network=network.string())
     tx_hash = "0F3EBEC1882E1EEAC5B7BDD836E976250F1CD072B79485877CEACCB92ACDDF52"
-    account = await client.get_tx_by_hash(tx_hash=tx_hash)
-    print(account)
+    transaction_response = await client.get_tx_by_hash(tx_hash=tx_hash)
+    print(transaction_response)
+
+    transaction_messages = composer.UnpackTransactionMessages(transaction=transaction_response.data)
+    print(transaction_messages)
+    first_message = transaction_messages[0]
+    print(first_message)
 
 if __name__ == '__main__':
     asyncio.get_event_loop().run_until_complete(main())

examples/exchange_client/explorer_rpc/1_GetTxByHash.py

@@ -2,17 +2,23 @@
 import logging
 
 from pyinjective.async_client import AsyncClient
+from pyinjective.composer import Composer
 from pyinjective.constant import Network
 
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
     client = AsyncClient(network, insecure=False)
+    composer = Composer(network=network.string())
     address = "inj1phd706jqzd9wznkk5hgsfkrc8jqxv0kmlj0kex"
-    type = "cosmos.bank.v1beta1.MsgSend"
+    message_type = "cosmos.bank.v1beta1.MsgSend"
     limit = 2
-    account = await client.get_account_txs(address=address, type=type, limit=limit)
-    print(account)
+    transactions_response = await client.get_account_txs(address=address, type=message_type, limit=limit)
+    print(transactions_response)
+    first_transaction_messages = composer.UnpackTransactionMessages(transaction=transactions_response.data[0])
+    print(first_transaction_messages)
+    first_message = first_transaction_messages[0]
+    print(first_message)
 
 if __name__ == '__main__':
     asyncio.get_event_loop().run_until_complete(main())

examples/exchange_client/explorer_rpc/2_AccountTxs.py

@@ -2,7 +2,7 @@
 from decimal import Decimal
 from time import time
 
-from google.protobuf import any_pb2, timestamp_pb2
+from google.protobuf import any_pb2, timestamp_pb2, json_format
 
 from .core.market import BinaryOptionMarket, DerivativeMarket, SpotMarket
 from .core.token import Token
@@ -15,7 +15,6 @@
 
 from .proto.injective.exchange.v1beta1 import tx_pb2 as injective_exchange_tx_pb
 from pyinjective.proto.injective.exchange.v1beta1 import exchange_pb2 as injective_dot_exchange_dot_v1beta1_dot_exchange__pb2
-from .proto.injective.types.v1beta1 import tx_response_pb2 as tx_response_pb
 
 from .proto.injective.auction.v1beta1 import tx_pb2 as injective_auction_tx_pb
 
@@ -966,6 +965,48 @@ def UnpackMsgExecResponse(msg_type, data):
         responses = [header_map[msg_type].FromString(result) for result in data.results]
         return responses
 
+    @staticmethod
+    def UnpackTransactionMessages(transaction):
+        meta_messages = json.loads(transaction.messages.decode())
+
+        header_map = {
+            "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder": injective_exchange_tx_pb.MsgCreateSpotLimitOrderResponse,
+            "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder": injective_exchange_tx_pb.MsgCreateSpotMarketOrderResponse,
+            "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder": injective_exchange_tx_pb.MsgCreateDerivativeLimitOrderResponse,
+            "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder": injective_exchange_tx_pb.MsgCreateDerivativeMarketOrderResponse,
+            "/injective.exchange.v1beta1.MsgCancelSpotOrder": injective_exchange_tx_pb.MsgCancelSpotOrderResponse,
+            "/injective.exchange.v1beta1.MsgCancelDerivativeOrder": injective_exchange_tx_pb.MsgCancelDerivativeOrderResponse,
+            "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders": injective_exchange_tx_pb.MsgBatchCancelSpotOrdersResponse,
+            "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders": injective_exchange_tx_pb.MsgBatchCancelDerivativeOrdersResponse,
+            "/injective.exchange.v1beta1.MsgBatchCreateSpotLimitOrders": injective_exchange_tx_pb.MsgBatchCreateSpotLimitOrders,
+            "/injective.exchange.v1beta1.MsgBatchCreateDerivativeLimitOrders": injective_exchange_tx_pb.MsgBatchCreateDerivativeLimitOrders,
+            "/injective.exchange.v1beta1.MsgBatchUpdateOrders": injective_exchange_tx_pb.MsgBatchUpdateOrders,
+            "/injective.exchange.v1beta1.MsgDeposit": injective_exchange_tx_pb.MsgDeposit,
+            "/injective.exchange.v1beta1.MsgWithdraw": injective_exchange_tx_pb.MsgWithdraw,
+            "/injective.exchange.v1beta1.MsgSubaccountTransfer": injective_exchange_tx_pb.MsgSubaccountTransfer,
+            "/injective.exchange.v1beta1.MsgLiquidatePosition": injective_exchange_tx_pb.MsgLiquidatePosition,
+            "/injective.exchange.v1beta1.MsgIncreasePositionMargin": injective_exchange_tx_pb.MsgIncreasePositionMargin,
+            "/injective.auction.v1beta1.MsgBid": injective_auction_tx_pb.MsgBid,
+            "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder": injective_exchange_tx_pb.MsgCreateBinaryOptionsLimitOrder,
+            "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder": injective_exchange_tx_pb.MsgCreateBinaryOptionsMarketOrder,
+            "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder": injective_exchange_tx_pb.MsgCancelBinaryOptionsOrder,
+            "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket": injective_exchange_tx_pb.MsgAdminUpdateBinaryOptionsMarket,
+            "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch": injective_exchange_tx_pb.MsgInstantBinaryOptionsMarketLaunch,
+            "/cosmos.bank.v1beta1.MsgSend": cosmos_bank_tx_pb.MsgSend,
+            "/cosmos.authz.v1beta1.MsgGrant": cosmos_authz_tx_pb.MsgGrant,
+            "/cosmos.authz.v1beta1.MsgExec": cosmos_authz_tx_pb.MsgExec,
+            "/cosmos.authz.v1beta1.MsgRevoke": cosmos_authz_tx_pb.MsgRevoke,
+            "/injective.oracle.v1beta1.MsgRelayPriceFeedPrice": injective_oracle_tx_pb.MsgRelayPriceFeedPrice,
+            "/injective.oracle.v1beta1.MsgRelayProviderPrices": injective_oracle_tx_pb.MsgRelayProviderPrices,
+        }
+
+        msgs = []
+        for msg in meta_messages:
+            msg_as_string_dict = json.dumps(msg["value"])
+            msgs.append(json_format.Parse(msg_as_string_dict, header_map[msg["type"]]()))
+
+        return msgs
+
     def _initialize_markets_and_tokens_from_files(self):
         config: ConfigParser = constant.CONFIGS[self.network]
         spot_markets = dict()

pyinjective/composer.py

@@ -121,7 +121,6 @@ def testnet(cls):
     @classmethod
     def mainnet(cls, node='lb'):
         nodes = [
-            'k8s', # us, prod
             'lb', # us, asia, prod
             'sentry0',  # ca, prod
             'sentry1',  # ca, prod
@@ -137,7 +136,7 @@ def mainnet(cls, node='lb'):
             grpc_exchange_endpoint = 'k8s.global.mainnet.exchange.grpc.injective.network:443'
             grpc_explorer_endpoint = 'k8s.global.mainnet.explorer.grpc.injective.network:443'
         else:
-            lcd_endpoint='https://lcd.injective.network'
+            lcd_endpoint=f'http://{node}.injective.network:10337'
             tm_websocket_endpoint=f'ws://{node}.injective.network:26657/websocket'
             grpc_endpoint=f'{node}.injective.network:9900'
             grpc_exchange_endpoint=f'{node}.injective.network:9910'