web3 7.0.0b2__tar.gz → 7.0.0b4__tar.gz

{web3-7.0.0b2/web3.egg-info → web3-7.0.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 7.0.0b2
+Version: 7.0.0b4
 Summary: web3.py
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -20,12 +20,12 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.7.4.post0
-Requires-Dist: eth-abi>=4.0.0
-Requires-Dist: eth-account>=0.8.0
+Requires-Dist: eth-abi>=5.0.1
+Requires-Dist: eth-account>=0.12.0
 Requires-Dist: eth-hash[pycryptodome]>=0.5.1
-Requires-Dist: eth-typing>=3.0.0
+Requires-Dist: eth-typing>=4.0.0
 Requires-Dist: eth-utils>=4.0.0
-Requires-Dist: hexbytes<0.4.0,>=0.1.0
+Requires-Dist: hexbytes>=1.2.0
 Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pywin32>=223; platform_system == "Windows"
 Requires-Dist: requests>=2.16.0
@@ -33,45 +33,32 @@ Requires-Dist: typing-extensions>=4.0.1
 Requires-Dist: websockets>=10.0.0
 Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
-Requires-Dist: eth-tester[py-evm]==v0.10.0-b.3; extra == "tester"
+Requires-Dist: eth-tester[py-evm]<0.12.0b1,>=0.11.0b1; extra == "tester"
 Requires-Dist: py-geth>=4.1.0; extra == "tester"
-Provides-Extra: linter
-Requires-Dist: black>=22.1.0; extra == "linter"
-Requires-Dist: flake8==3.8.3; extra == "linter"
-Requires-Dist: isort>=5.11.0; extra == "linter"
-Requires-Dist: mypy==1.4.1; extra == "linter"
-Requires-Dist: types-setuptools>=57.4.4; extra == "linter"
-Requires-Dist: types-requests>=2.26.1; extra == "linter"
 Provides-Extra: docs
 Requires-Dist: sphinx>=5.3.0; extra == "docs"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "docs"
 Requires-Dist: towncrier<22,>=21; extra == "docs"
 Provides-Extra: dev
-Requires-Dist: eth-tester[py-evm]==v0.10.0-b.3; extra == "dev"
+Requires-Dist: eth-tester[py-evm]<0.12.0b1,>=0.11.0b1; extra == "dev"
 Requires-Dist: py-geth>=4.1.0; extra == "dev"
-Requires-Dist: black>=22.1.0; extra == "dev"
-Requires-Dist: flake8==3.8.3; extra == "dev"
-Requires-Dist: isort>=5.11.0; extra == "dev"
-Requires-Dist: mypy==1.4.1; extra == "dev"
-Requires-Dist: types-setuptools>=57.4.4; extra == "dev"
-Requires-Dist: types-requests>=2.26.1; extra == "dev"
 Requires-Dist: sphinx>=5.3.0; extra == "dev"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "dev"
 Requires-Dist: towncrier<22,>=21; extra == "dev"
+Requires-Dist: build>=0.9.0; extra == "dev"
 Requires-Dist: bumpversion; extra == "dev"
 Requires-Dist: flaky>=3.7.0; extra == "dev"
 Requires-Dist: hypothesis>=3.31.2; extra == "dev"
-Requires-Dist: importlib-metadata<5.0; python_version < "3.8" and extra == "dev"
-Requires-Dist: pytest>=7.0.0; extra == "dev"
+Requires-Dist: pre-commit>=3.4.0; extra == "dev"
 Requires-Dist: pytest-asyncio<0.23,>=0.18.1; extra == "dev"
 Requires-Dist: pytest-mock>=1.10; extra == "dev"
 Requires-Dist: pytest-watch>=4.2; extra == "dev"
 Requires-Dist: pytest-xdist>=1.29; extra == "dev"
+Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: setuptools>=38.6.0; extra == "dev"
 Requires-Dist: tox>=3.18.0; extra == "dev"
 Requires-Dist: tqdm>4.32; extra == "dev"
 Requires-Dist: twine>=1.13; extra == "dev"
-Requires-Dist: build>=0.9.0; extra == "dev"
 
 # web3.py
 
@@ -81,9 +68,9 @@ Requires-Dist: build>=0.9.0; extra == "dev"
 
 A Python library for interacting with Ethereum.
 
--   Python 3.8+ support
+- Python 3.8+ support
 
----
+______________________________________________________________________
 
 ## Quickstart
 
@@ -101,6 +88,6 @@ guidelines for [contributing](https://web3py.readthedocs.io/en/latest/contributi
 then check out issues that are labeled
 [Good First Issue](https://github.com/ethereum/web3.py/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+First+Issue%22).
 
----
+______________________________________________________________________
 
 #### Questions on implementation or usage? Join the conversation on [discord](https://discord.gg/GHryRvPB84).

{web3-7.0.0b2 → web3-7.0.0b4}/README.md

@@ -6,9 +6,9 @@
 
 A Python library for interacting with Ethereum.
 
--   Python 3.8+ support
+- Python 3.8+ support
 
----
+______________________________________________________________________
 
 ## Quickstart
 
@@ -26,6 +26,6 @@ guidelines for [contributing](https://web3py.readthedocs.io/en/latest/contributi
 then check out issues that are labeled
 [Good First Issue](https://github.com/ethereum/web3.py/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+First+Issue%22).
 
----
+______________________________________________________________________
 
 #### Questions on implementation or usage? Join the conversation on [discord](https://discord.gg/GHryRvPB84).

{web3-7.0.0b2 → web3-7.0.0b4}/ens/_normalization.py

@@ -48,7 +48,7 @@ with open(os.path.join(specs_dir_path, "normalization_spec.json")) as spec:
     # clean `FE0F` (65039) from entries since it's optional
     for e in NORMALIZATION_SPEC["emoji"]:
         if 65039 in e:
-            for i in range(e.count(65039)):
+            for _ in range(e.count(65039)):
                 e.remove(65039)
 
 with open(os.path.join(specs_dir_path, "nf.json")) as nf:
@@ -222,7 +222,6 @@ def _validate_tokens_and_get_label_type(tokens: List[Token]) -> str:
     :param List[Token] tokens: the tokens to validate
     :raises InvalidName: if any of the tokens are invalid
     """
-
     if all(token.type == TokenType.EMOJI for token in tokens):
         return "emoji"
 
@@ -423,7 +422,6 @@ def normalize_name_ensip15(name: str) -> ENSNormalizedName:
     :param str name: the dot-separated ENS name
     :raises InvalidName: if ``name`` has invalid syntax
     """
-
     if not name:
         raise InvalidName("Name cannot be empty")
     elif isinstance(name, (bytes, bytearray)):

{web3-7.0.0b2 → web3-7.0.0b4}/ens/async_ens.py

@@ -46,6 +46,7 @@ from ens.constants import (
 )
 from ens.exceptions import (
     AddressMismatch,
+    ENSValueError,
     ResolverNotFound,
     UnauthorizedError,
     UnownedName,
@@ -89,7 +90,7 @@ class AsyncENS(BaseENS):
     like getting the address for a name.
 
     Unless otherwise specified, all addresses are assumed to be a `str` in
-    `checksum format <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md>`_,
+    `checksum format <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md>`_,  # blocklint: pragma # noqa: E501
     like: ``"0x314159265dD8dbb310642f98f50C066173C1259b"``
     """
 
@@ -98,7 +99,7 @@ class AsyncENS(BaseENS):
 
     def __init__(
         self,
-        provider: "AsyncBaseProvider" = cast("AsyncBaseProvider", default),
+        provider: "AsyncBaseProvider" = None,
         addr: ChecksumAddress = None,
         middleware: Optional[Sequence[Tuple["Middleware", str]]] = None,
     ) -> None:
@@ -108,6 +109,7 @@ class AsyncENS(BaseENS):
         :param hex-string addr: the address of the ENS registry on-chain.
             If not provided, ENS.py will default to the mainnet ENS registry address.
         """
+        provider = provider or cast("AsyncBaseProvider", default)
         self.w3 = init_async_web3(provider, middleware)
 
         ens_addr = addr if addr else ENS_MAINNET_ADDR
@@ -167,7 +169,7 @@ class AsyncENS(BaseENS):
     async def setup_address(
         self,
         name: str,
-        address: Union[Address, ChecksumAddress, HexAddress] = cast(
+        address: Union[Address, ChecksumAddress, HexAddress] = cast(  # noqa: B008
             ChecksumAddress, default
         ),
         coin_type: Optional[int] = None,
@@ -204,7 +206,7 @@ class AsyncENS(BaseENS):
         elif is_binary_address(address):
             address = to_checksum_address(cast(str, address))
         elif not is_checksum_address(address):
-            raise ValueError("You must supply the address in checksum format")
+            raise ENSValueError("You must supply the address in checksum format")
         if await self.address(name) == address:
             return None
         if address is None:
@@ -282,7 +284,7 @@ class AsyncENS(BaseENS):
             if is_binary_address(address):
                 address = to_checksum_address(address)
             if not is_checksum_address(address):
-                raise ValueError("You must supply the address in checksum format")
+                raise ENSValueError("You must supply the address in checksum format")
             await self._assert_control(address, name)
             if not resolved:
                 await self.setup_address(name, address, transact=transact)
@@ -305,7 +307,7 @@ class AsyncENS(BaseENS):
     async def setup_owner(
         self,
         name: str,
-        new_owner: ChecksumAddress = cast(ChecksumAddress, default),
+        new_owner: ChecksumAddress = None,
         transact: Optional["TxParams"] = None,
     ) -> Optional[ChecksumAddress]:
         """
@@ -332,6 +334,7 @@ class AsyncENS(BaseENS):
         :raises UnauthorizedError: if ``'from'`` in `transact` does not own `name`
         :returns: the new owner's address
         """
+        new_owner = new_owner or cast(ChecksumAddress, default)
         if not transact:
             transact = {}
         transact = deepcopy(transact)
@@ -466,9 +469,9 @@ class AsyncENS(BaseENS):
             resolver_addr = await self.address("resolver.eth")
         namehash = raw_name_to_hash(name)
         if await self.ens.caller.resolver(namehash) != resolver_addr:
-            await self.ens.functions.setResolver(  # type: ignore
-                namehash, resolver_addr
-            ).transact(transact)
+            await self.ens.functions.setResolver(namehash, resolver_addr).transact(
+                transact
+            )
         return cast("AsyncContract", self._resolver_contract(address=resolver_addr))
 
     async def _resolve(
@@ -490,7 +493,7 @@ class AsyncENS(BaseENS):
         ):
             contract_func_with_args = (fn_name, [node])
 
-            calldata = resolver.encodeABI(*contract_func_with_args)
+            calldata = resolver.encode_abi(*contract_func_with_args)
             contract_call_result = await resolver.caller.resolve(
                 ens_encode_name(normal_name),
                 calldata,
@@ -550,7 +553,7 @@ class AsyncENS(BaseENS):
         transact = deepcopy(transact)
         transact["from"] = old_owner or owner
         for label in reversed(unowned):
-            await self.ens.functions.setSubnodeOwner(  # type: ignore
+            await self.ens.functions.setSubnodeOwner(
                 raw_name_to_hash(owned),
                 label_to_hash(label),
                 owner,

{web3-7.0.0b2 → web3-7.0.0b4}/ens/contract_data.py

@@ -3,8 +3,8 @@ import json
 
 """
 This contract data is taken from the actual ENS contracts deployed on mainnet.
-The information was taken from etherscan.io and may need to be updated as the ENS 
-contracts are updated. 
+The information was taken from etherscan.io and may need to be updated as the ENS
+contracts are updated.
 
 https://etherscan.io/accounts/label/ens
 """

{web3-7.0.0b2 → web3-7.0.0b4}/ens/ens.py

@@ -46,6 +46,7 @@ from .constants import (
 )
 from .exceptions import (
     AddressMismatch,
+    ENSValueError,
     ResolverNotFound,
     UnauthorizedError,
     UnownedName,
@@ -88,7 +89,7 @@ class ENS(BaseENS):
     like getting the address for a name.
 
     Unless otherwise specified, all addresses are assumed to be a `str` in
-    `checksum format <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md>`_,
+    `checksum format <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md>`_,  # blocklint: pragma # noqa: E501
     like: ``"0x314159265dD8dbb310642f98f50C066173C1259b"``
     """
 
@@ -97,7 +98,7 @@ class ENS(BaseENS):
 
     def __init__(
         self,
-        provider: "BaseProvider" = cast("BaseProvider", default),
+        provider: "BaseProvider" = None,
         addr: ChecksumAddress = None,
         middleware: Optional[Sequence[Tuple["Middleware", str]]] = None,
     ) -> None:
@@ -108,6 +109,7 @@ class ENS(BaseENS):
             If not provided, ENS.py will default to the mainnet ENS
             registry address.
         """
+        provider = provider or cast("BaseProvider", default)
         self.w3 = init_web3(provider, middleware)
 
         ens_addr = addr if addr else ENS_MAINNET_ADDR
@@ -170,7 +172,7 @@ class ENS(BaseENS):
     def setup_address(
         self,
         name: str,
-        address: Union[Address, ChecksumAddress, HexAddress] = cast(
+        address: Union[Address, ChecksumAddress, HexAddress] = cast(  # noqa: B008
             ChecksumAddress, default
         ),
         coin_type: Optional[int] = None,
@@ -208,7 +210,7 @@ class ENS(BaseENS):
         elif is_binary_address(address):
             address = to_checksum_address(cast(str, address))
         elif not is_checksum_address(address):
-            raise ValueError("You must supply the address in checksum format")
+            raise ENSValueError("You must supply the address in checksum format")
         if self.address(name) == address:
             return None
         if address is None:
@@ -284,7 +286,7 @@ class ENS(BaseENS):
             if is_binary_address(address):
                 address = to_checksum_address(address)
             if not is_checksum_address(address):
-                raise ValueError("You must supply the address in checksum format")
+                raise ENSValueError("You must supply the address in checksum format")
             self._assert_control(address, name)
             if not resolved:
                 self.setup_address(name, address, transact=transact)
@@ -307,7 +309,7 @@ class ENS(BaseENS):
     def setup_owner(
         self,
         name: str,
-        new_owner: ChecksumAddress = cast(ChecksumAddress, default),
+        new_owner: ChecksumAddress = None,
         transact: Optional["TxParams"] = None,
     ) -> Optional[ChecksumAddress]:
         """
@@ -334,6 +336,7 @@ class ENS(BaseENS):
         :raises UnauthorizedError: if ``'from'`` in `transact` does not own `name`
         :returns: the new owner's address
         """
+        new_owner = new_owner or cast(ChecksumAddress, default)
         if not transact:
             transact = {}
 
@@ -477,7 +480,7 @@ class ENS(BaseENS):
         if _resolver_supports_interface(resolver, ENS_EXTENDED_RESOLVER_INTERFACE_ID):
             contract_func_with_args = (fn_name, [node])
 
-            calldata = resolver.encodeABI(*contract_func_with_args)
+            calldata = resolver.encode_abi(*contract_func_with_args)
             contract_call_result = resolver.caller.resolve(
                 ens_encode_name(normal_name),
                 calldata,

{web3-7.0.0b2 → web3-7.0.0b4}/ens/exceptions.py

@@ -9,7 +9,19 @@ class ENSException(Exception):
     Base class for all ENS Errors
     """
 
-    pass
+
+class ENSValueError(ENSException, ValueError):
+    """
+    An ENS exception wrapper for `ValueError`, for better control over
+    exception handling.
+    """
+
+
+class ENSTypeError(ENSException, TypeError):
+    """
+    An ENS exception wrapper for `TypeError`, for better control over
+    exception handling.
+    """
 
 
 class AddressMismatch(ENSException):
@@ -19,18 +31,15 @@ class AddressMismatch(ENSException):
     not currently point to the address.
     """
 
-    pass
 
-
-class InvalidName(idna.IDNAError, ENSException):
+# type ignored because subclassing IDNAError which has type Any
+class InvalidName(idna.IDNAError, ENSException):  # type: ignore[misc]
     """
-    This exception is raised if the provided name does not meet
-    the normalization standards specified in `ENSIP-15
+    Raised if the provided name does not meet the normalization
+    standards specified in `ENSIP-15
     <https://docs.ens.domains/ens-improvement-proposals/ensip-15-normalization-standard>`_.
     """
 
-    pass
-
 
 class UnauthorizedError(ENSException):
     """
@@ -39,8 +48,6 @@ class UnauthorizedError(ENSException):
     ``transact`` keyword argument to the owner of the name.
     """
 
-    pass
-
 
 class UnownedName(ENSException):
     """
@@ -50,48 +57,36 @@ class UnownedName(ENSException):
     first with :meth:`~ens.ENS.setup_address`.
     """
 
-    pass
-
 
 class ResolverNotFound(ENSException):
     """
     Raised if no resolver was found for the name you are trying to resolve.
     """
 
-    pass
-
 
 class UnsupportedFunction(ENSException):
     """
     Raised if a resolver does not support a particular method.
     """
 
-    pass
-
 
 class BidTooLow(ENSException):
     """
     Raised if you bid less than the minimum amount
     """
 
-    pass
-
 
 class InvalidBidHash(ENSException):
     """
     Raised if you supply incorrect data to generate the bid hash.
     """
 
-    pass
-
 
 class InvalidLabel(ENSException):
     """
     Raised if you supply an invalid label
     """
 
-    pass
-
 
 class OversizeTransaction(ENSException):
     """
@@ -101,8 +96,6 @@ class OversizeTransaction(ENSException):
     For example: when you try to start too many auctions at once.
     """
 
-    pass
-
 
 class UnderfundedBid(ENSException):
     """
@@ -110,10 +103,9 @@ class UnderfundedBid(ENSException):
     as your intent to bid.
     """
 
-    pass
-
 
-class ENSValidationError(ENSException, ValidationError):
+# type ignored because subclassing ValidationError which has type Any
+class ENSValidationError(ENSException, ValidationError):  # type: ignore[misc]
     """
     Raised if there is a validation error
     """