Feat/refactor markets and tokens

Makefile

@@ -35,6 +35,6 @@ copy-proto:
   done
 
 tests:
-	pytest -v tests/**
+	pytest -v
 
 .PHONY: all gen gen-client copy-proto tests

Pipfile

@@ -25,6 +25,7 @@ websockets = "*"
 [dev-packages]
 pytest = "*"
 pytest-asyncio = "*"
+pytest-grpc = "*"
 requests-mock = "*"
 
 [requires]

README.md

@@ -87,6 +87,12 @@ make tests
 ```
 
 ### Changelogs
+**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

examples/chain_client/0_LocalOrderHash.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/13_MsgIncreasePositionMargin.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/15_MsgWithdraw.py

@@ -13,9 +13,7 @@
 # limitations under the License.
 
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -25,10 +23,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/16_MsgSubaccountTransfer.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/17_MsgBatchUpdateOrders.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account
@@ -132,7 +130,7 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
+    sim_res_msg = composer.MsgResponses(sim_res, simulation=True)
     print("---Simulation Response---")
     print(sim_res_msg)
 

examples/chain_client/18_MsgBid.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -10,10 +8,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/19_MsgGrant.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/1_MsgSend.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,11 +9,11 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     # set custom cookie location (optional) - defaults to current dir
     client = AsyncClient(network, insecure=False, chain_cookie_location="/tmp/.chain_cookie")
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/20_MsgExec.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account
@@ -63,9 +61,9 @@ async def main() -> None:
         print(sim_res)
         return
 
-    sim_res_msg = ProtoMsgComposer.MsgResponses(sim_res, simulation=True)
+    sim_res_msg = composer.MsgResponses(sim_res, simulation=True)
     data=sim_res_msg[0]
-    unpacked_msg_res = ProtoMsgComposer.UnpackMsgExecResponse(
+    unpacked_msg_res = composer.UnpackMsgExecResponse(
         msg_type=msg0.__class__.__name__,
         data=data
     )

examples/chain_client/21_MsgRevoke.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/22_MsgSendToEth.py

@@ -1,8 +1,6 @@
 import asyncio
-import logging
 import requests
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/23_MsgRelayPriceFeedPrice.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/24_MsgRewardsOptOut.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/25_MsgDelegate.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/26_MsgWithdrawDelegatorReward.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account

examples/chain_client/2_MsgDeposit.py

@@ -1,7 +1,5 @@
 import asyncio
-import logging
 
-from pyinjective.composer import Composer as ProtoMsgComposer
 from pyinjective.async_client import AsyncClient
 from pyinjective.transaction import Transaction
 from pyinjective.constant import Network
@@ -11,10 +9,10 @@
 async def main() -> None:
     # select network: local, testnet, mainnet
     network = Network.testnet()
-    composer = ProtoMsgComposer(network=network.string())
 
     # initialize grpc client
     client = AsyncClient(network, insecure=False)
+    composer = await client.composer()
     await client.sync_timeout_height()
 
     # load account