|
9 | 9 | import grpc |
10 | 10 | from google.protobuf import json_format |
11 | 11 |
|
12 | | -from pyinjective import constant |
13 | 12 | from pyinjective.client.chain.grpc.chain_grpc_auth_api import ChainGrpcAuthApi |
14 | 13 | from pyinjective.client.chain.grpc.chain_grpc_authz_api import ChainGrpcAuthZApi |
15 | 14 | from pyinjective.client.chain.grpc.chain_grpc_bank_api import ChainGrpcBankApi |
@@ -2659,22 +2658,13 @@ async def _initialize_tokens_and_markets(self): |
2659 | 2658 | ) |
2660 | 2659 |
|
2661 | 2660 | for market_info in valid_markets: |
2662 | | - ticker = market_info["ticker"] |
2663 | | - if "/" in ticker: |
2664 | | - base_token_symbol, quote_token_symbol = ticker.split(constant.TICKER_TOKENS_SEPARATOR) |
2665 | | - else: |
2666 | | - base_token_symbol = market_info["baseTokenMeta"]["symbol"] |
2667 | | - quote_token_symbol = market_info["quoteTokenMeta"]["symbol"] |
2668 | | - |
2669 | 2661 | base_token = self._token_representation( |
2670 | | - symbol=base_token_symbol, |
2671 | 2662 | token_meta=market_info["baseTokenMeta"], |
2672 | 2663 | denom=market_info["baseDenom"], |
2673 | 2664 | tokens_by_denom=tokens_by_denom, |
2674 | 2665 | tokens_by_symbol=tokens_by_symbol, |
2675 | 2666 | ) |
2676 | 2667 | quote_token = self._token_representation( |
2677 | | - symbol=quote_token_symbol, |
2678 | 2668 | token_meta=market_info["quoteTokenMeta"], |
2679 | 2669 | denom=market_info["quoteDenom"], |
2680 | 2670 | tokens_by_denom=tokens_by_denom, |
@@ -2704,10 +2694,7 @@ async def _initialize_tokens_and_markets(self): |
2704 | 2694 | ) |
2705 | 2695 |
|
2706 | 2696 | for market_info in valid_markets: |
2707 | | - quote_token_symbol = market_info["quoteTokenMeta"]["symbol"] |
2708 | | - |
2709 | 2697 | quote_token = self._token_representation( |
2710 | | - symbol=quote_token_symbol, |
2711 | 2698 | token_meta=market_info["quoteTokenMeta"], |
2712 | 2699 | denom=market_info["quoteDenom"], |
2713 | 2700 | tokens_by_denom=tokens_by_denom, |
@@ -2769,22 +2756,21 @@ async def _initialize_tokens_and_markets(self): |
2769 | 2756 |
|
2770 | 2757 | def _token_representation( |
2771 | 2758 | self, |
2772 | | - symbol: str, |
2773 | 2759 | token_meta: Dict[str, Any], |
2774 | 2760 | denom: str, |
2775 | 2761 | tokens_by_denom: Dict[str, Token], |
2776 | 2762 | tokens_by_symbol: Dict[str, Token], |
2777 | 2763 | ) -> Token: |
2778 | 2764 | if denom not in tokens_by_denom: |
2779 | 2765 | unique_symbol = denom |
2780 | | - for symbol_candidate in [symbol, token_meta["symbol"], token_meta["name"]]: |
| 2766 | + for symbol_candidate in [token_meta["symbol"], token_meta["name"]]: |
2781 | 2767 | if symbol_candidate not in tokens_by_symbol: |
2782 | 2768 | unique_symbol = symbol_candidate |
2783 | 2769 | break |
2784 | 2770 |
|
2785 | 2771 | token = Token( |
2786 | 2772 | name=token_meta["name"], |
2787 | | - symbol=symbol, |
| 2773 | + symbol=token_meta["symbol"], |
2788 | 2774 | denom=denom, |
2789 | 2775 | address=token_meta["address"], |
2790 | 2776 | decimals=token_meta["decimals"], |
|
0 commit comments