yeref 0.24.15__py3-none-any.whl → 0.24.17__py3-none-any.whl

yeref/yeref.py

@@ -7612,7 +7612,7 @@ async def get_smc_info(address, KEYS_JSON, is_test_only=False):
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -7706,7 +7706,7 @@ async def get_wallet_address(address, master, KEYS_JSON, is_test_only=False, is_
         for provider, keys in data["ton"].items():
             for it in keys:
                 if provider == "tonapi":
-                    key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -7816,7 +7816,7 @@ async def get_nft_data(address, KEYS_JSON, is_test_only=False, help_link=None):
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -7987,7 +7987,7 @@ async def get_collection_data(address, KEYS_JSON, is_test_only=False):
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -8115,7 +8115,7 @@ async def get_nft_in_account(address, collection, KEYS_JSON, is_test_only=False,
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -8187,7 +8187,7 @@ async def get_any_activity(address, KEYS_JSON, is_test_only=False):
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -8266,7 +8266,7 @@ async def get_any_nfts(address, KEYS_JSON, is_test_only=False):
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -8344,7 +8344,7 @@ async def get_any_jettons(address, KEYS_JSON, is_test_only=False):
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -8432,17 +8432,18 @@ 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": 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}'
-                    #         }
-                    #     ])
+                if provider == "tonapi":    # continue
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
+                    
+                    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 = 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)
                     if key: 
@@ -8507,7 +8508,7 @@ async def get_method_data(address, KEYS_JSON, is_test_only=False, method_name='g
         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')
+                    key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
                     if key:
                         items.append([
                             'tonapi',
@@ -15616,7 +15617,7 @@ async def ch_games(USER_GAMES, game, condition, balls=-1):
 #         return USER_GAMES
 
 
-async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username, full_name, is_premium=False, usr_hash='',
+async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username, full_name, is_premium=False, usr_sig='',
                         page=''):
     USER_TID = chat_id
     USER_VARS = json.loads(USER_VARS_)
@@ -15666,7 +15667,7 @@ async def get_user_vars(PROJECT_USERNAME, BASE_P, ENT_TID, chat_id, lc, username
                 USER_VARS['USER_LZ'] = lz
             # endregion
             print(f"{USER_VARS=}, {lc=}")
-        USER_VARS['USER_HASH'] = usr_hash
+        USER_VARS['USER_SIG'] = usr_sig
         USER_VARS['USER_ISPREMIUM'] = is_premium
 
         sql = f""" 

{yeref-0.24.15.dist-info → yeref-0.24.17.dist-info}/METADATA

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

yeref-0.24.17.dist-info/RECORD

@@ -0,0 +1,8 @@
+yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
+yeref/l_.py,sha256=7SgEs9hcn0b-AKW3BeE6DTY1Mo-ZtNCTPAKVv7RE5PM,1178681
+yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
+yeref/yeref.py,sha256=j48IFV9QYUhU8volod6KqNwLv44nv-ybTty6fu4bXVE,1012329
+yeref-0.24.17.dist-info/METADATA,sha256=A7Bx3hd9VUnQl5jezhgIQOeJPIvTZEmxsSn1d3VRL5o,119
+yeref-0.24.17.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+yeref-0.24.17.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.24.17.dist-info/RECORD,,

{yeref-0.24.15.dist-info → yeref-0.24.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

yeref-0.24.15.dist-info/RECORD

@@ -1,8 +0,0 @@
-yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
-yeref/l_.py,sha256=7SgEs9hcn0b-AKW3BeE6DTY1Mo-ZtNCTPAKVv7RE5PM,1178681
-yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
-yeref/yeref.py,sha256=1rpCFJhTKNSfjDd8jCwuSvvbiOK1dZ94IRZEZ4Vcr8k,1012306
-yeref-0.24.15.dist-info/METADATA,sha256=DKy1eBT51Eb0B4_L0NBqkdj6E1htYCqLAHMITm5mIEI,119
-yeref-0.24.15.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-yeref-0.24.15.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.24.15.dist-info/RECORD,,