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

Author: abel

CHANGELOG.md

@@ -2,9 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.0.1] - 2023-11-07
+## [1.0.1] - 2023-12-11
+### Added
+- Added low level API components for all modules (chain, exchain and explorer) to make the Python SDK compatible with the TypeScript SDK.
+
 ### Changed
 - Updated proto definitions to injective-core v1.12.2-testnet and injective-indexer v1.12.45-rc3
+- Added new functions in AsyncClient to interact with chain, exchange and explorer using the low level API components
+- Marked old function sin AsyncClient as deprecated (the functions will be removed in a future version)
+- Updated all API examples to use the new AsyncClient functions
 
 ## [1.0] - 2023-11-01
 ### Added
@@ -17,6 +23,23 @@ All notable changes to this project will be documented in this file.
 - Moved changelog from the README.md file to its own CHANGELOG.md file
 - Remove `aiocron` dependency. Use plain asyncio tasks to solve the timeout height synchronization
 - Updated the gas fee buffer used to calculate fee consumption in all examples
+- Refactored logic in AsyncClient to load markets and tokens, to ensure there are no duplicated tokens with the same denom
+
+## [0.9.10]
+* Synchronized markets and tokens config files to add SOL/USDT spot market
+
+## [0.9.9]
+* Synchronized markets and tokens config files to add USDY/USDT and WHALE/USDT spot markets
+
+
+## [0.9.8]
+* Synchronized markets and tokens config files to add PYTH/USDT spot market
+
+## [0.9.7]
+* Added PYTH/USDT PERP market info in mainnet metadata ini file
+
+## [0.9.6]
+* Synchronized denom ini files with Indexer information for mainnet, testnet and devnet to include TALIS/INJ and KUJI/USDT markets
 
 ## [0.9.5]
 * Updated fetch_metadata script (to synchronize denom ini files) to reuse logic in AsyncClient

pyinjective/async_client.py

@@ -152,7 +152,8 @@ def __init__(
         self._initialize_timeout_height_sync_task()
 
         self._tokens_and_markets_initialization_lock = asyncio.Lock()
-        self._tokens: Optional[Dict[str, Token]] = None
+        self._tokens_by_denom: Optional[Dict[str, Token]] = None
+        self._tokens_by_symbol: Optional[Dict[str, Token]] = None
         self._spot_markets: Optional[Dict[str, SpotMarket]] = None
         self._derivative_markets: Optional[Dict[str, DerivativeMarket]] = None
         self._binary_option_markets: Optional[Dict[str, BinaryOptionMarket]] = None
@@ -295,11 +296,11 @@ def __init__(
         )
 
     async def all_tokens(self) -> Dict[str, Token]:
-        if self._tokens is None:
+        if self._tokens_by_symbol is None:
             async with self._tokens_and_markets_initialization_lock:
-                if self._tokens is None:
+                if self._tokens_by_symbol is None:
                     await self._initialize_tokens_and_markets()
-        return deepcopy(self._tokens)
+        return deepcopy(self._tokens_by_symbol)
 
     async def all_spot_markets(self) -> Dict[str, SpotMarket]:
         if self._spot_markets is None:
@@ -2463,7 +2464,7 @@ async def _initialize_tokens_and_markets(self):
         spot_markets = dict()
         derivative_markets = dict()
         binary_option_markets = dict()
-        tokens = dict()
+        tokens_by_symbol = dict()
         tokens_by_denom = dict()
         markets_info = (await self.fetch_spot_markets(market_statuses=["active"]))["markets"]
         valid_markets = (
@@ -2485,19 +2486,16 @@ async def _initialize_tokens_and_markets(self):
                 symbol=base_token_symbol,
                 token_meta=market_info["baseTokenMeta"],
                 denom=market_info["baseDenom"],
-                all_tokens=tokens,
+                tokens_by_denom=tokens_by_denom,
+                tokens_by_symbol=tokens_by_symbol,
             )
-            if base_token.denom not in tokens_by_denom:
-                tokens_by_denom[base_token.denom] = base_token
-
             quote_token = self._token_representation(
                 symbol=quote_token_symbol,
                 token_meta=market_info["quoteTokenMeta"],
                 denom=market_info["quoteDenom"],
-                all_tokens=tokens,
+                tokens_by_denom=tokens_by_denom,
+                tokens_by_symbol=tokens_by_symbol,
             )
-            if quote_token.denom not in tokens_by_denom:
-                tokens_by_denom[quote_token.denom] = quote_token
 
             market = SpotMarket(
                 id=market_info["marketId"],
@@ -2528,10 +2526,9 @@ async def _initialize_tokens_and_markets(self):
                 symbol=quote_token_symbol,
                 token_meta=market_info["quoteTokenMeta"],
                 denom=market_info["quoteDenom"],
-                all_tokens=tokens,
+                tokens_by_denom=tokens_by_denom,
+                tokens_by_symbol=tokens_by_symbol,
             )
-            if quote_token.denom not in tokens_by_denom:
-                tokens_by_denom[quote_token.denom] = quote_token
 
             market = DerivativeMarket(
                 id=market_info["marketId"],
@@ -2580,35 +2577,41 @@ async def _initialize_tokens_and_markets(self):
 
             binary_option_markets[market.id] = market
 
-        self._tokens = tokens
+        self._tokens_by_denom = tokens_by_denom
+        self._tokens_by_symbol = tokens_by_symbol
         self._spot_markets = spot_markets
         self._derivative_markets = derivative_markets
         self._binary_option_markets = binary_option_markets
 
     def _token_representation(
-        self, symbol: str, token_meta: Dict[str, Any], denom: str, all_tokens: Dict[str, Token]
+        self,
+        symbol: str,
+        token_meta: Dict[str, Any],
+        denom: str,
+        tokens_by_denom: Dict[str, Token],
+        tokens_by_symbol: Dict[str, Token],
     ) -> Token:
-        token = Token(
-            name=token_meta["name"],
-            symbol=symbol,
-            denom=denom,
-            address=token_meta["address"],
-            decimals=token_meta["decimals"],
-            logo=token_meta["logo"],
-            updated=int(token_meta["updatedAt"]),
-        )
-
-        existing_token = all_tokens.get(token.symbol, None)
-        if existing_token is None:
-            all_tokens[token.symbol] = token
-            existing_token = token
-        elif existing_token.denom != denom:
-            existing_token = all_tokens.get(token.name, None)
-            if existing_token is None:
-                all_tokens[token.name] = token
-                existing_token = token
-
-        return existing_token
+        if denom not in tokens_by_denom:
+            unique_symbol = denom
+            for symbol_candidate in [symbol, token_meta["symbol"], token_meta["name"]]:
+                if symbol_candidate not in tokens_by_symbol:
+                    unique_symbol = symbol_candidate
+                    break
+
+            token = Token(
+                name=token_meta["name"],
+                symbol=symbol,
+                denom=denom,
+                address=token_meta["address"],
+                decimals=token_meta["decimals"],
+                logo=token_meta["logo"],
+                updated=int(token_meta["updatedAt"]),
+            )
+
+            tokens_by_denom[denom] = token
+            tokens_by_symbol[unique_symbol] = token
+
+        return tokens_by_denom[denom]
 
     def _chain_cookie_metadata_requestor(self) -> Coroutine:
         request = tendermint_query.GetLatestBlockRequest()

pyinjective/denoms_mainnet.ini

@@ -529,6 +529,60 @@ min_display_price_tick_size = 0.00001
 min_quantity_tick_size = 10000000
 min_display_quantity_tick_size = 10
 
+[0xf09dd242aea343afd7b6644151bb00d1b8770d842881009bea867658602b6bf0]
+description = 'Mainnet Spot TALIS/INJ'
+base = 6
+quote = 18
+min_price_tick_size = 1000000
+min_display_price_tick_size = 0.000001
+min_quantity_tick_size = 10000000
+min_display_quantity_tick_size = 10
+
+[0x6922cf4383294c673971dd06aa4ae5ef47f65cb4f1ec1c2af4271c5e5ca67486]
+description = 'Mainnet Spot KUJI/USDT'
+base = 6
+quote = 6
+min_price_tick_size = 0.001
+min_display_price_tick_size = 0.001
+min_quantity_tick_size = 100000
+min_display_quantity_tick_size = 0.1
+
+[0xa6ec1de114a5ffa85b6b235144383ce51028a1c0c2dee7db5ff8bf14d5ca0d49]
+description = 'Mainnet Spot PYTH/USDT'
+base = 6
+quote = 6
+min_price_tick_size = 0.0001
+min_display_price_tick_size = 0.0001
+min_quantity_tick_size = 1000000
+min_display_quantity_tick_size = 1
+
+[0x75f6a79b552dac417df219ab384be19cb13b53dec7cf512d73a965aee8bc83af]
+description = 'Mainnet Spot USDY/USDT'
+base = 18
+quote = 6
+min_price_tick_size = 0.0000000000000001
+min_display_price_tick_size = 0.0001
+min_quantity_tick_size = 100000000000000000
+min_display_quantity_tick_size = 0.1
+
+[0x689ea50a30b0aeaf162e57100fefe5348a00099774f1c1ebcd90c4b480fda46a]
+description = 'Mainnet Spot WHALE/USDT'
+base = 6
+quote = 6
+min_price_tick_size = 0.00001
+min_display_price_tick_size = 0.00001
+min_quantity_tick_size = 10000000
+min_display_quantity_tick_size = 10
+
+[0xac938722067b1dfdfbf346d2434573fb26cb090d309b19af17df2c6827ceb32c]
+description = 'Mainnet Spot SOL/USDT'
+base = 8
+quote = 6
+min_price_tick_size = 0.0001
+min_display_price_tick_size = 0.01
+min_quantity_tick_size = 1000000
+min_display_quantity_tick_size = 0.01
+
 [0x4ca0f92fc28be0c9761326016b5a1a2177dd6375558365116b5bdda9abc229ce]
 description = 'Mainnet Derivative BTC/USDT PERP'
 base = 0
@@ -601,15 +655,6 @@ min_display_price_tick_size = 0.01
 min_quantity_tick_size = 0.1
 min_display_quantity_tick_size = 0.1
 
-[0x3b7fb1d9351f7fa2e6e0e5a11b3639ee5e0486c33a6a74f629c3fc3c3043efd5]
-description = 'Mainnet Derivative BONK/USDT PERP'
-base = 0
-quote = 6
-min_price_tick_size = 0.0001
-min_display_price_tick_size = 0.0000000001
-min_quantity_tick_size = 0.1
-min_display_quantity_tick_size = 0.1
-
 [0xcd0c859a99f26bb3530e21890937ed77d20754aa7825a599c71710514fc125ef]
 description = 'Mainnet Derivative 1MPEPE/USDT PERP'
 base = 0
@@ -628,15 +673,6 @@ min_display_price_tick_size = 0.0001
 min_quantity_tick_size = 0.1
 min_display_quantity_tick_size = 0.1
 
-[0x1afa358349b140e49441b6e68529578c7d2f27f06e18ef874f428457c0aaeb8b]
-description = 'Mainnet Derivative SEI/USDT PERP'
-base = 0
-quote = 6
-min_price_tick_size = 100
-min_display_price_tick_size = 0.0001
-min_quantity_tick_size = 0.1
-min_display_quantity_tick_size = 0.1
-
 [0x332230109e7afb839b4750d4cf961666b608071ecb64dac55662dac37529639e]
 description = 'Mainnet Derivative BTC/USDTkv PERP'
 base = 0
@@ -673,6 +709,15 @@ min_display_price_tick_size = 0.001
 min_quantity_tick_size = 0.1
 min_display_quantity_tick_size = 0.1
 
+[0x887beca72224f88fb678a13a1ae91d39c53a05459fd37ef55005eb68f745d46d]
+description = 'Mainnet Derivative PYTH/USDT PERP'
+base = 0
+quote = 6
+min_price_tick_size = 100
+min_display_price_tick_size = 0.0001
+min_quantity_tick_size = 1
+min_display_quantity_tick_size = 1
+
 [AAVE]
 peggy_denom = peggy0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9
 decimals = 18
@@ -737,6 +782,10 @@ decimals = 18
 peggy_denom = ibc/57AA1A70A4BC9769C525EBF6386F7A21536E04A79D62E1981EFCEF9428EBB205
 decimals = 6
 
+[KUJI]
+peggy_denom = ibc/9A115B56E769B92621FFF90567E2D60EFD146E86E867491DB69EEDA9ADC36204
+decimals = 6
+
 [LDO]
 peggy_denom = factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1q6zlut7gtkzknkk773jecujwsdkgq882akqksk
 decimals = 6
@@ -769,6 +818,10 @@ decimals = 6
 peggy_denom = peggy0xf9a06dE3F6639E6ee4F079095D5093644Ad85E8b
 decimals = 18
 
+[PYTH]
+peggy_denom = factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1tjcf9497fwmrnk22jfu5hsdq82qshga54ajvzy
+decimals = 6
+
 [QNT]
 peggy_denom = peggy0x4a220E6096B25EADb88358cb44068A3248254675
 decimals = 18
@@ -837,6 +890,10 @@ decimals = 6
 peggy_denom = ibc/4ABBEF4C8926DDDB320AE5188CFD63267ABBCEFC0583E4AE05D6E5AA2401DDAB
 decimals = 6
 
+[USDY]
+peggy_denom = peggy0x96F6eF951840721AdBF46Ac996b59E0235CB985C
+decimals = 18
+
 [UST]
 peggy_denom = ibc/B448C0CA358B958301D328CCDC5D5AD642FC30A6D3AE106FF721DB315F3DDE5C
 decimals = 6
@@ -849,6 +906,10 @@ decimals = 8
 peggy_denom = peggy0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2
 decimals = 18
 
+[WHALE]
+peggy_denom = ibc/D6E6A20ABDD600742D22464340A7701558027759CE14D12590F8EA869CCCF445
+decimals = 6
+
 [WMATIC]
 peggy_denom = factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1dxv423h8ygzgxmxnvrf33ws3k94aedfdevxd8h
 decimals = 8