blockapi 1.4.0__tar.gz → 2.0.0__tar.gz

{blockapi-1.4.0 → blockapi-2.0.0}/PKG-INFO

@@ -1,29 +1,26 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 1.4.0
+Version: 2.0.0
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.
 License: MIT
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: requests==2.32.4
-Requires-Dist: pytz>=2019.2
+Requires-Dist: requests<3.0,>=2.28
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: coinaddrng==1.1.1
-Requires-Dist: cfscrape>=2.0.8
-Requires-Dist: ethereum_input_decoder>=0.2.2
-Requires-Dist: web3<6.0.0,>=5.2.2
+Requires-Dist: web3<8.0.0,>=5.2.2
 Requires-Dist: bs4>=0.0.1
 Requires-Dist: lxml>=4.4.1
 Requires-Dist: pydantic>=1.10.2
-Requires-Dist: marko==1.3.0
+Requires-Dist: marko<2.0.0,>=1.3.0
 Requires-Dist: fake_useragent>=1.1.3
 Requires-Dist: pytest
 Requires-Dist: pytest-vcr
 Requires-Dist: requests_mock>=1.9.3
-Requires-Dist: attrs<=22.1.0,>=17.4.0
-Requires-Dist: solders==0.22.0
+Requires-Dist: attrs<23.0.0,>=17.4.0
+Requires-Dist: solders>=0.22.0
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/services.py

@@ -3,13 +3,10 @@ from abc import ABC, abstractmethod
 from datetime import datetime
 from time import sleep
 
-import cfscrape
 import requests
 
 import blockapi
 
-cfscrape.DEFAULT_CIPHERS += ':!SHA'
-
 
 class Service(ABC):
     """General class for handling blockchain API services."""
@@ -34,13 +31,7 @@ class Service(ABC):
         return self.base_url
 
     def request(
-        self,
-        request_method,
-        with_rate_limit=False,
-        with_cloudflare=False,
-        body=None,
-        headers=None,
-        **params
+        self, request_method, with_rate_limit=False, body=None, headers=None, **params
     ):
         request_url = self.build_request_url(request_method, **params)
 
@@ -53,10 +44,7 @@ class Service(ABC):
         if not headers:
             headers = {}
 
-        if with_cloudflare:
-            reqobj = cfscrape.create_scraper()
-        else:
-            reqobj = requests
+        reqobj = requests
 
         if with_rate_limit and self.rate_limit:
             self.wait_for_next_request()

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/test/v2/api/conftest.py

@@ -1,6 +1,8 @@
 import json
 import os
-from typing import List, Union
+from typing import Union
+
+import pytest
 
 
 def read_json_file(file_name: str) -> Union[list, dict]:
@@ -13,3 +15,10 @@ def read_file(file_name: str) -> str:
     json_path = os.path.abspath(os.path.join(os.path.dirname(__file__), file_name))
     with open(json_path, encoding="utf-8") as f:
         return f.read()
+
+
+@pytest.fixture(scope='session')
+def vcr_config():
+    return {
+        'decode_compressed_response': True,
+    }

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/test/v2/api/test_solana.py

@@ -549,7 +549,7 @@ def metaplex_content():
         'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
         'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
         'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=='
+        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='
     )
 
 

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/v2/api/perpetual/perpetual.py

@@ -49,7 +49,7 @@ def perp_contract_address(contract_name: str) -> ChecksumAddress:
         raise ValueError('Invalid contract name.')
 
     contract_address = contract_map[contract_name]
-    return Web3.toChecksumAddress(contract_address)
+    return Web3.to_checksum_address(contract_address)
 
 
 @lru_cache()

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/v2/api/synthetix/synthetix.py

@@ -84,7 +84,7 @@ def snx_contract_address(
     # as last 42 characters
     try:
         contract_address = result.url[-42:]
-        return Web3.toChecksumAddress(contract_address)
+        return Web3.to_checksum_address(contract_address)
     except Exception:
         raise ValueError(f'Contract {contract_name} not found.')
 
@@ -118,7 +118,7 @@ def snx_optimism_contract_address(
 
         table = BeautifulSoup(html_tab_raw, 'lxml')
         row = table.find('td', text=contract_name).parent
-        return Web3.toChecksumAddress(row.contents[5].text.strip())
+        return Web3.to_checksum_address(row.contents[5].text.strip())
 
     except Exception:
         raise ValueError(f'Contract {contract_name} not found.')
@@ -341,7 +341,7 @@ class SynthetixApi(CustomizableBlockchainApi, IBalance, ABC):
         if symbol == 'SNX':
             synth_addr = easy_call(snx_contract, 'proxy')
         else:
-            synth_contract_addr = Web3.toChecksumAddress(
+            synth_contract_addr = Web3.to_checksum_address(
                 easy_call(snx_contract, 'synths', symbol.encode())
             )
             synth_contract = self.w3.eth.contract(synth_contract_addr, abi=erc20_abi)

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/v2/api/web3_utils.py

@@ -133,10 +133,10 @@ def to_checksum_address(func):
 
     @functools.wraps(func)
     def inner(self, address, *args, **kwargs):
-        return func(self, Web3.toChecksumAddress(address), *args, **kwargs)
+        return func(self, Web3.to_checksum_address(address), *args, **kwargs)
 
     return inner
 
 
 def ensure_checksum_address(address: Optional[str]) -> Optional[str]:
-    return Web3.toChecksumAddress(address) if address is not None else None
+    return Web3.to_checksum_address(address) if address is not None else None

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi/v2/models.py

@@ -255,6 +255,7 @@ class Blockchain(str, Enum):
     PERSISTENCE = 'persistence'
     PICASSO = 'picasso'
     PLAT_ON = 'plat-on'
+    PLASMA = 'plasma'
     POLIS_CHAIN = 'polis-chain'
     POLKADOT = 'polkadot'
     POLYGON = 'polygon'

{blockapi-1.4.0 → blockapi-2.0.0}/blockapi.egg-info/PKG-INFO

@@ -1,29 +1,26 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 1.4.0
+Version: 2.0.0
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.
 License: MIT
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: requests==2.32.4
-Requires-Dist: pytz>=2019.2
+Requires-Dist: requests<3.0,>=2.28
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: coinaddrng==1.1.1
-Requires-Dist: cfscrape>=2.0.8
-Requires-Dist: ethereum_input_decoder>=0.2.2
-Requires-Dist: web3<6.0.0,>=5.2.2
+Requires-Dist: web3<8.0.0,>=5.2.2
 Requires-Dist: bs4>=0.0.1
 Requires-Dist: lxml>=4.4.1
 Requires-Dist: pydantic>=1.10.2
-Requires-Dist: marko==1.3.0
+Requires-Dist: marko<2.0.0,>=1.3.0
 Requires-Dist: fake_useragent>=1.1.3
 Requires-Dist: pytest
 Requires-Dist: pytest-vcr
 Requires-Dist: requests_mock>=1.9.3
-Requires-Dist: attrs<=22.1.0,>=17.4.0
-Requires-Dist: solders==0.22.0
+Requires-Dist: attrs<23.0.0,>=17.4.0
+Requires-Dist: solders>=0.22.0
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type

blockapi-2.0.0/blockapi.egg-info/requires.txt

@@ -0,0 +1,14 @@
+requests<3.0,>=2.28
+python-dateutil>=2.8.0
+coinaddrng==1.1.1
+web3<8.0.0,>=5.2.2
+bs4>=0.0.1
+lxml>=4.4.1
+pydantic>=1.10.2
+marko<2.0.0,>=1.3.0
+fake_useragent>=1.1.3
+pytest
+pytest-vcr
+requests_mock>=1.9.3
+attrs<23.0.0,>=17.4.0
+solders>=0.22.0

{blockapi-1.4.0 → blockapi-2.0.0}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as f:
 
 PACKAGES = find_packages(where='.')
 
-__version__ = "1.4.0"
+__version__ = "2.0.0"
 
 setuptools.setup(
     name='blockapi',
@@ -18,23 +18,20 @@ setuptools.setup(
     long_description_content_type='text/markdown',
     packages=PACKAGES,
     install_requires=[
-        'requests==2.32.4',
-        'pytz>=2019.2',
+        'requests>=2.28,<3.0',
         'python-dateutil>=2.8.0',
         'coinaddrng==1.1.1',
-        'cfscrape>=2.0.8',
-        'ethereum_input_decoder>=0.2.2',
-        'web3>=5.2.2,<6.0.0',
+        'web3>=5.2.2,<8.0.0',
         'bs4>=0.0.1',
         'lxml>=4.4.1',
         'pydantic>=1.10.2',
-        'marko==1.3.0',
+        'marko>=1.3.0,<2.0.0',
         'fake_useragent>=1.1.3',
         'pytest',
         'pytest-vcr',
         'requests_mock>=1.9.3',
-        'attrs>=17.4.0,<=22.1.0',
-        'solders==0.22.0',
+        'attrs>=17.4.0,<23.0.0',
+        'solders>=0.22.0',
     ],
     url="https://github.com/crypkit/blockapi",
 )

blockapi-1.4.0/blockapi.egg-info/requires.txt

@@ -1,17 +0,0 @@
-requests==2.32.4
-pytz>=2019.2
-python-dateutil>=2.8.0
-coinaddrng==1.1.1
-cfscrape>=2.0.8
-ethereum_input_decoder>=0.2.2
-web3<6.0.0,>=5.2.2
-bs4>=0.0.1
-lxml>=4.4.1
-pydantic>=1.10.2
-marko==1.3.0
-fake_useragent>=1.1.3
-pytest
-pytest-vcr
-requests_mock>=1.9.3
-attrs<=22.1.0,>=17.4.0
-solders==0.22.0