yeref 0.24.11__tar.gz → 0.24.13__tar.gz

{yeref-0.24.11 → yeref-0.24.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.11
+Version: 0.24.13
 Summary: desc-f
 Author: john smith
 Dynamic: author

{yeref-0.24.11 → yeref-0.24.13}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='yeref',
-    version='0.24.11',
+    version='0.24.13',
     description='desc-f',
     author='john smith',
     packages=['yeref'],

{yeref-0.24.11 → yeref-0.24.13}/yeref/yeref.py

@@ -8432,27 +8432,26 @@ async def calculate_wallet_address(owner, master, KEYS_JSON, is_test_only=False)
         items = []
         for provider, keys in data["ton"].items():  # provider = "tonapi" или "toncenter"
             for it in keys:  # it = {"all": "..."} или {"testnet": "..."}
-                if provider == "tonapi":
-                    key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
-                    if key:
-                        items.append([
-                            'tonapi',
-                            f'https://{pfx_testnet}tonapi.io/v2/accounts/{owner}/jettons/{master}',
-                            {
-                                'accept': 'application/json',
-                                'Authorization': f'Bearer {key}'
-                            }
-                        ])
+                if provider == "tonapi": continue
+                    # key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
+                    # if key:
+                    #     items.append([
+                    #         'tonapi',
+                    #         f'https://{pfx_testnet}tonapi.io/v2/accounts/{owner}/jettons/{master}',
+                    #         {
+                    #             'accept': 'application/json',
+                    #             'Authorization': f'Bearer {key}'
+                    #         }
+                    #     ])
                 elif provider == "toncenter":
-                    key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
+                    key = next((it['testnet'] if is_test_only else it['mainnet']) for it in keys if
+                               (is_test_only and 'testnet' in it) or (not is_test_only and 'mainnet' in it)), None)
+                    print(f"{key=}")
                     if key:
                         items.append([
                             'toncenter',
                             f'https://{pfx_testnet}toncenter.com/api/v3/jetton/wallets?owner_address={owner}&jetton_address={master}&limit=1&offset=0',
-                            {
-                                'accept': 'application/json',
-                                'X-API-Key': key
-                            }
+                            {'accept': 'application/json', 'X-API-Key': key}
                         ])
 
         while True:

{yeref-0.24.11 → yeref-0.24.13}/yeref.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.11
+Version: 0.24.13
 Summary: desc-f
 Author: john smith
 Dynamic: author