yeref 0.24.11__py3-none-any.whl → 0.24.13__py3-none-any.whl

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.dist-info → yeref-0.24.13.dist-info}/METADATA

@@ -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.13.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=AAUaqN3p5B4NontIrpm7RLRtGUUHE9UCEyGnVmKy928,1011613
+yeref-0.24.13.dist-info/METADATA,sha256=3s-qOpIP6hFP8d9lZ4SU16w7J0xyB9Wdc2F_FoQRJ3g,119
+yeref-0.24.13.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+yeref-0.24.13.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.24.13.dist-info/RECORD,,

yeref-0.24.11.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=LUYpjeEx2iQqhSopx2Yx6UrQ9qoCQAQV-kTf8-twY2A,1011528
-yeref-0.24.11.dist-info/METADATA,sha256=7MKbsvYsegN0erbcdk0p52XVJNFPkg7TVxhfPj_7Y6M,119
-yeref-0.24.11.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-yeref-0.24.11.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.24.11.dist-info/RECORD,,