yeref 0.24.14__tar.gz → 0.24.16__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: yeref
3
- Version: 0.24.14
3
+ Version: 0.24.16
4
4
  Summary: desc-f
5
5
  Author: john smith
6
6
  Dynamic: author
@@ -2,7 +2,7 @@ from setuptools import setup
2
2
 
3
3
  setup(
4
4
  name='yeref',
5
- version='0.24.14',
5
+ version='0.24.16',
6
6
  description='desc-f',
7
7
  author='john smith',
8
8
  packages=['yeref'],
@@ -7612,7 +7612,7 @@ async def get_smc_info(address, KEYS_JSON, is_test_only=False):
7612
7612
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
7613
7613
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
7614
7614
  if provider == "tonapi":
7615
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
7615
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
7616
7616
  if key:
7617
7617
  items.append([
7618
7618
  'tonapi',
@@ -7623,7 +7623,7 @@ async def get_smc_info(address, KEYS_JSON, is_test_only=False):
7623
7623
  }
7624
7624
  ])
7625
7625
  elif provider == "toncenter":
7626
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
7626
+ 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)
7627
7627
  if key:
7628
7628
  items.append([
7629
7629
  'toncenter',
@@ -7706,7 +7706,7 @@ async def get_wallet_address(address, master, KEYS_JSON, is_test_only=False, is_
7706
7706
  for provider, keys in data["ton"].items():
7707
7707
  for it in keys:
7708
7708
  if provider == "tonapi":
7709
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
7709
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
7710
7710
  if key:
7711
7711
  items.append([
7712
7712
  'tonapi',
@@ -7717,7 +7717,7 @@ async def get_wallet_address(address, master, KEYS_JSON, is_test_only=False, is_
7717
7717
  }
7718
7718
  ])
7719
7719
  elif provider == "toncenter":
7720
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
7720
+ 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)
7721
7721
  if key:
7722
7722
  items.append([
7723
7723
  'toncenter',
@@ -7816,7 +7816,7 @@ async def get_nft_data(address, KEYS_JSON, is_test_only=False, help_link=None):
7816
7816
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
7817
7817
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
7818
7818
  if provider == "tonapi":
7819
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
7819
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
7820
7820
  if key:
7821
7821
  items.append([
7822
7822
  'tonapi',
@@ -7827,7 +7827,7 @@ async def get_nft_data(address, KEYS_JSON, is_test_only=False, help_link=None):
7827
7827
  }
7828
7828
  ])
7829
7829
  elif provider == "toncenter":
7830
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
7830
+ 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)
7831
7831
  if key:
7832
7832
  items.append([
7833
7833
  'toncenter',
@@ -7987,7 +7987,7 @@ async def get_collection_data(address, KEYS_JSON, is_test_only=False):
7987
7987
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
7988
7988
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
7989
7989
  if provider == "tonapi":
7990
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
7990
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
7991
7991
  if key:
7992
7992
  items.append([
7993
7993
  'tonapi',
@@ -7998,7 +7998,7 @@ async def get_collection_data(address, KEYS_JSON, is_test_only=False):
7998
7998
  }
7999
7999
  ])
8000
8000
  elif provider == "toncenter":
8001
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
8001
+ 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)
8002
8002
  if key:
8003
8003
  items.append([
8004
8004
  'toncenter',
@@ -8115,7 +8115,7 @@ async def get_nft_in_account(address, collection, KEYS_JSON, is_test_only=False,
8115
8115
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
8116
8116
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
8117
8117
  if provider == "tonapi":
8118
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
8118
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
8119
8119
  if key:
8120
8120
  items.append([
8121
8121
  'tonapi',
@@ -8126,7 +8126,7 @@ async def get_nft_in_account(address, collection, KEYS_JSON, is_test_only=False,
8126
8126
  }
8127
8127
  ])
8128
8128
  elif provider == "toncenter":
8129
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
8129
+ 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)
8130
8130
  if key:
8131
8131
  items.append([
8132
8132
  'toncenter',
@@ -8187,7 +8187,7 @@ async def get_any_activity(address, KEYS_JSON, is_test_only=False):
8187
8187
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
8188
8188
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
8189
8189
  if provider == "tonapi":
8190
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
8190
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
8191
8191
  if key:
8192
8192
  items.append([
8193
8193
  'tonapi',
@@ -8198,7 +8198,7 @@ async def get_any_activity(address, KEYS_JSON, is_test_only=False):
8198
8198
  }
8199
8199
  ])
8200
8200
  elif provider == "toncenter":
8201
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
8201
+ 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)
8202
8202
  if key:
8203
8203
  items.append([
8204
8204
  'toncenter',
@@ -8266,7 +8266,7 @@ async def get_any_nfts(address, KEYS_JSON, is_test_only=False):
8266
8266
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
8267
8267
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
8268
8268
  if provider == "tonapi":
8269
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
8269
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
8270
8270
  if key:
8271
8271
  items.append([
8272
8272
  'tonapi',
@@ -8277,7 +8277,7 @@ async def get_any_nfts(address, KEYS_JSON, is_test_only=False):
8277
8277
  }
8278
8278
  ])
8279
8279
  elif provider == "toncenter":
8280
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
8280
+ 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)
8281
8281
  if key:
8282
8282
  items.append([
8283
8283
  'toncenter',
@@ -8344,7 +8344,7 @@ async def get_any_jettons(address, KEYS_JSON, is_test_only=False):
8344
8344
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
8345
8345
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
8346
8346
  if provider == "tonapi":
8347
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
8347
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
8348
8348
  if key:
8349
8349
  items.append([
8350
8350
  'tonapi',
@@ -8355,7 +8355,7 @@ async def get_any_jettons(address, KEYS_JSON, is_test_only=False):
8355
8355
  }
8356
8356
  ])
8357
8357
  elif provider == "toncenter":
8358
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
8358
+ 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)
8359
8359
  if key:
8360
8360
  items.append([
8361
8361
  'toncenter',
@@ -8432,27 +8432,21 @@ async def calculate_wallet_address(owner, master, KEYS_JSON, is_test_only=False)
8432
8432
  items = []
8433
8433
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
8434
8434
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
8435
- if provider == "tonapi": continue
8436
- # key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
8437
- # if key:
8438
- # items.append([
8439
- # 'tonapi',
8440
- # f'https://{pfx_testnet}tonapi.io/v2/accounts/{owner}/jettons/{master}',
8441
- # {
8442
- # 'accept': 'application/json',
8443
- # 'Authorization': f'Bearer {key}'
8444
- # }
8445
- # ])
8446
- elif provider == "toncenter":
8447
- key = next(
8448
- (it['testnet'] if is_test_only else it['mainnet']
8449
- for it in keys
8450
- if (is_test_only and 'testnet' in it)
8451
- or (not is_test_only and 'mainnet' in it)
8452
- ),
8453
- None
8454
- )
8435
+ if provider == "tonapi": # continue
8436
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
8437
+
8455
8438
  if key:
8439
+ items.append([
8440
+ 'tonapi',
8441
+ f'https://{pfx_testnet}tonapi.io/v2/accounts/{owner}/jettons/{master}',
8442
+ {
8443
+ 'accept': 'application/json',
8444
+ 'Authorization': f'Bearer {key}'
8445
+ }
8446
+ ])
8447
+ elif provider == "toncenter":
8448
+ 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)
8449
+ if key:
8456
8450
  items.append([
8457
8451
  'toncenter',
8458
8452
  f'https://{pfx_testnet}toncenter.com/api/v3/jetton/wallets'
@@ -8514,7 +8508,7 @@ async def get_method_data(address, KEYS_JSON, is_test_only=False, method_name='g
8514
8508
  for provider, keys in data["ton"].items(): # provider = "tonapi" или "toncenter"
8515
8509
  for it in keys: # it = {"all": "..."} или {"testnet": "..."}
8516
8510
  if provider == "tonapi":
8517
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('all')
8511
+ key = random.choice([it['all'] for it in keys if 'all' in it]) if keys else None
8518
8512
  if key:
8519
8513
  items.append([
8520
8514
  'tonapi',
@@ -8525,7 +8519,7 @@ async def get_method_data(address, KEYS_JSON, is_test_only=False, method_name='g
8525
8519
  }
8526
8520
  ])
8527
8521
  elif provider == "toncenter":
8528
- key = it.get('testnet') if is_test_only and 'testnet' in it else it.get('mainnet')
8522
+ 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)
8529
8523
  if key:
8530
8524
  items.append([
8531
8525
  'toncenter',
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: yeref
3
- Version: 0.24.14
3
+ Version: 0.24.16
4
4
  Summary: desc-f
5
5
  Author: john smith
6
6
  Dynamic: author
File without changes
File without changes
File without changes
File without changes
File without changes