(fix) Updated examples and the run-examples.sh script to enable the execution off all examples with the new code base

Author: Abel Armoa

examples/exchange_client/spot_exchange_rpc/14_Orderbooks.py

@@ -11,7 +11,7 @@ async def main() -> None:
         "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe",
         "0x7a57e705bb4e09c88aecfc295569481dbf2fe1d5efe364651fbe72385938e9b0"
     ]
-    orderbooks = await client.get_spot_orderbooks(market_ids=market_ids)
+    orderbooks = await client.get_spot_orderbooksV2(market_ids=market_ids)
     print(orderbooks)
 
 if __name__ == '__main__':

examples/exchange_client/spot_exchange_rpc/16_OrderbooksV2.py

@@ -8,7 +8,7 @@ async def main() -> None:
     network = Network.testnet()
     client = AsyncClient(network, insecure=False)
     market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"
-    orderbook = await client.get_spot_orderbook(market_id=market_id)
+    orderbook = await client.get_spot_orderbookV2(market_id=market_id)
     print(orderbook)
 
 if __name__ == '__main__':

examples/exchange_client/spot_exchange_rpc/4_Orderbook.py

@@ -675,14 +675,6 @@ async def stream_spot_markets(self, **kwargs):
         metadata = await self.load_cookie(type="exchange")
         return self.stubSpotExchange.StreamMarkets.__call__(req, metadata=metadata)
 
-    async def get_spot_orderbook(self, market_id: str):
-        req = spot_exchange_rpc_pb.OrderbookRequest(market_id=market_id)
-        return await self.stubSpotExchange.Orderbook(req)
-
-    async def get_spot_orderbooks(self, market_ids: List):
-        req = spot_exchange_rpc_pb.OrderbooksRequest(market_ids=market_ids)
-        return await self.stubSpotExchange.Orderbooks(req)
-
     async def get_spot_orderbookV2(self, market_id: str):
         req = spot_exchange_rpc_pb.OrderbookV2Request(market_id=market_id)
         return await self.stubSpotExchange.OrderbookV2(req)

pyinjective/async_client.py

@@ -69,6 +69,10 @@ def __init__(
 
         """
         self.network = network
+        self.spot_markets = dict()
+        self.derivative_markets = dict()
+        self.binary_option_markets = dict()
+        self.tokens = dict()
         if spot_markets is None or derivative_markets is None or binary_option_markets is None or tokens is None:
             self._initialize_markets_and_tokens_from_files()
         else:
@@ -1004,7 +1008,7 @@ def _initialize_markets_and_tokens_from_files(self):
                         min_price_tick_size=Decimal(str(configuration_section["min_price_tick_size"])),
                         min_quantity_tick_size=Decimal(str(configuration_section["min_quantity_tick_size"]))
                     )
-                    spot_markets[description] = market
+                    spot_markets[market.id] = market
                 else:
                     market = DerivativeMarket(
                         id=section_name,
@@ -1024,7 +1028,7 @@ def _initialize_markets_and_tokens_from_files(self):
                         min_quantity_tick_size=Decimal(str(configuration_section["min_quantity_tick_size"])),
                     )
 
-                    derivative_markets[description] = market
+                    derivative_markets[market.id] = market
 
             elif section_name != "DEFAULT":
                 token = Token(
@@ -1037,8 +1041,9 @@ def _initialize_markets_and_tokens_from_files(self):
                     updated=-1,
                 )
 
-                tokens[token.symbol] = Token
+                tokens[token.symbol] = token
 
         self.tokens = tokens
         self.spot_markets = spot_markets
         self.derivative_markets = derivative_markets
+        self.binary_option_markets = dict()

pyinjective/composer.py

@@ -52,7 +52,7 @@ min_display_price_tick_size = 1e-05
 min_quantity_tick_size = 100000
 min_display_quantity_tick_size = 0.1
 
-[0xe112199d9ee44ceb2697ea0edd1cd422223c105f3ed2bdf85223d3ca59f5909a]
+[0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6]
 description = 'Testnet Derivative INJ/USDT PERP'
 base = 0
 quote = 6

pyinjective/denoms_testnet.ini

@@ -1,5 +1,5 @@
 runChainExamples(){
-  examples=$(find -s examples/chain_client_examples -type f -mindepth 1 -name '*.py')
+  examples=$(find -s examples/chain_client -type f -mindepth 1 -name '*.py')
   echo "Running all chain examples..."
   for example in $examples
   do
@@ -10,7 +10,7 @@ runChainExamples(){
 }
 
 runExchangeExamples(){
-  dirs=$(find -s examples/exchange_api_examples -type d -mindepth 1)
+  dirs=$(find -s examples/exchange_client -type d -mindepth 1)
   for dir in $dirs
   do
     examples=$(find -s $dir -type f -name '*.py')
@@ -26,6 +26,8 @@ runExchangeExamples(){
   done
 }
 
+export PYTHONPATH=$PYTHONPATH:$(pwd)
+
 TYPE=$1
 case $TYPE in
   "chain")

run-examples.sh

@@ -38,6 +38,19 @@ def basic_composer(self, inj_usdt_spot_market, btc_usdt_perp_market, first_match
 
         return composer
 
+    def test_composer_initialization_from_ini_files(self):
+        composer = Composer(network=Network.devnet().string())
+
+        inj_token = composer.tokens["INJ"]
+        inj_usdt_spot_market = next((market for market in composer.spot_markets.values() if market.ticker == "'Devnet Spot INJ/USDT'"))
+        inj_usdt_perp_market = next((market for market in composer.derivative_markets.values() if market.ticker == "'Devnet Derivative INJ/USDT PERP'"))
+
+        assert (18 == inj_token.decimals)
+        assert (18 == inj_usdt_spot_market.base_token.decimals)
+        assert (6 == inj_usdt_spot_market.quote_token.decimals)
+        assert (6 == inj_usdt_perp_market.quote_token.decimals)
+
+
     def test_buy_spot_order_creation(self, basic_composer: Composer, inj_usdt_spot_market: SpotMarket):
         fee_recipient = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r"
         price = 6.869