web3 6.15.1__tar.gz → 7.0.0b2__tar.gz

{web3-6.15.1 → web3-7.0.0b2}/MANIFEST.in

@@ -5,7 +5,3 @@ recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 
 recursive-include ens/specs *
-
-recursive-include ethpm/assets *
-recursive-include ethpm/ethpm-spec/examples *
-recursive-include ethpm/ethpm-spec/spec *

{web3-6.15.1 → web3-7.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 6.15.1
+Version: 7.0.0b2
 Summary: web3.py
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -12,12 +12,11 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.7.2
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.7.4.post0
@@ -25,19 +24,17 @@ Requires-Dist: eth-abi>=4.0.0
 Requires-Dist: eth-account>=0.8.0
 Requires-Dist: eth-hash[pycryptodome]>=0.5.1
 Requires-Dist: eth-typing>=3.0.0
-Requires-Dist: eth-utils>=2.1.0
+Requires-Dist: eth-utils>=4.0.0
 Requires-Dist: hexbytes<0.4.0,>=0.1.0
-Requires-Dist: jsonschema>=4.0.0
-Requires-Dist: lru-dict<1.3.0,>=1.1.6
-Requires-Dist: protobuf>=4.21.6
+Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pywin32>=223; platform_system == "Windows"
 Requires-Dist: requests>=2.16.0
 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.9.1-b.2; extra == "tester"
-Requires-Dist: py-geth>=3.14.0; extra == "tester"
+Requires-Dist: eth-tester[py-evm]==v0.10.0-b.3; 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"
@@ -45,25 +42,22 @@ 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"
-Requires-Dist: types-protobuf==3.19.13; 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.9.1-b.2; extra == "dev"
-Requires-Dist: py-geth>=3.14.0; extra == "dev"
+Requires-Dist: eth-tester[py-evm]==v0.10.0-b.3; 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: types-protobuf==3.19.13; 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: ipfshttpclient==0.8.0a2; extra == "dev"
 Requires-Dist: bumpversion; extra == "dev"
 Requires-Dist: flaky>=3.7.0; extra == "dev"
 Requires-Dist: hypothesis>=3.31.2; extra == "dev"
@@ -77,10 +71,7 @@ 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: when-changed>=0.3.0; extra == "dev"
 Requires-Dist: build>=0.9.0; extra == "dev"
-Provides-Extra: ipfs
-Requires-Dist: ipfshttpclient==0.8.0a2; extra == "ipfs"
 
 # web3.py
 
@@ -90,7 +81,7 @@ Requires-Dist: ipfshttpclient==0.8.0a2; extra == "ipfs"
 
 A Python library for interacting with Ethereum.
 
--   Python 3.7.2+ support
+-   Python 3.8+ support
 
 ---
 

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

@@ -6,7 +6,7 @@
 
 A Python library for interacting with Ethereum.
 
--   Python 3.7.2+ support
+-   Python 3.8+ support
 
 ---
 

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

@@ -3,13 +3,11 @@ from enum import (
 )
 import json
 import os
-from sys import (
-    version_info,
-)
 from typing import (
     Any,
     Dict,
     List,
+    Literal,
     Optional,
     Set,
     Tuple,
@@ -25,17 +23,6 @@ from .exceptions import (
     InvalidName,
 )
 
-# TODO: remove once web3 supports python>=3.8
-if version_info >= (3, 8):
-    from typing import (
-        Literal,
-    )
-else:
-    from typing_extensions import (  # type: ignore
-        Literal,
-    )
-
-
 # -- setup -- #
 
 

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

@@ -71,12 +71,14 @@ if TYPE_CHECKING:
         AsyncContractFunction,
     )
     from web3.main import AsyncWeb3  # noqa: F401
+    from web3.middleware.base import (  # noqa: F401
+        Middleware,
+    )
     from web3.providers import (  # noqa: F401
         AsyncBaseProvider,
         BaseProvider,
     )
     from web3.types import (  # noqa: F401
-        AsyncMiddleware,
         TxParams,
     )
 
@@ -98,7 +100,7 @@ class AsyncENS(BaseENS):
         self,
         provider: "AsyncBaseProvider" = cast("AsyncBaseProvider", default),
         addr: ChecksumAddress = None,
-        middlewares: Optional[Sequence[Tuple["AsyncMiddleware", str]]] = None,
+        middleware: Optional[Sequence[Tuple["Middleware", str]]] = None,
     ) -> None:
         """
         :param provider: a single provider used to connect to Ethereum
@@ -106,7 +108,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.
         """
-        self.w3 = init_async_web3(provider, middlewares)
+        self.w3 = init_async_web3(provider, middleware)
 
         ens_addr = addr if addr else ENS_MAINNET_ADDR
         self.ens = self.w3.eth.contract(abi=abis.ENS, address=ens_addr)
@@ -127,10 +129,8 @@ class AsyncENS(BaseENS):
             provided, defaults to the mainnet ENS registry address.
         """
         provider = w3.manager.provider
-        middlewares = w3.middleware_onion.middlewares
-        ns = cls(
-            cast("AsyncBaseProvider", provider), addr=addr, middlewares=middlewares
-        )
+        middleware = w3.middleware_onion.middleware
+        ns = cls(cast("AsyncBaseProvider", provider), addr=addr, middleware=middleware)
 
         # inherit strict bytes checking from w3 instance
         ns.strict_bytes_type_checking = w3.strict_bytes_type_checking

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

@@ -71,11 +71,13 @@ if TYPE_CHECKING:
         Contract,
         ContractFunction,
     )
+    from web3.middleware.base import (  # noqa: F401
+        Middleware,
+    )
     from web3.providers import (  # noqa: F401
         BaseProvider,
     )
     from web3.types import (  # noqa: F401
-        Middleware,
         TxParams,
     )
 
@@ -97,7 +99,7 @@ class ENS(BaseENS):
         self,
         provider: "BaseProvider" = cast("BaseProvider", default),
         addr: ChecksumAddress = None,
-        middlewares: Optional[Sequence[Tuple["Middleware", str]]] = None,
+        middleware: Optional[Sequence[Tuple["Middleware", str]]] = None,
     ) -> None:
         """
         :param provider: a single provider used to connect to Ethereum
@@ -106,7 +108,7 @@ class ENS(BaseENS):
             If not provided, ENS.py will default to the mainnet ENS
             registry address.
         """
-        self.w3 = init_web3(provider, middlewares)
+        self.w3 = init_web3(provider, middleware)
 
         ens_addr = addr if addr else ENS_MAINNET_ADDR
         self.ens = self.w3.eth.contract(abi=abis.ENS, address=ens_addr)
@@ -127,8 +129,8 @@ class ENS(BaseENS):
             provided, defaults to the mainnet ENS registry address.
         """
         provider = w3.manager.provider
-        middlewares = w3.middleware_onion.middlewares
-        ns = cls(cast("BaseProvider", provider), addr=addr, middlewares=middlewares)
+        middleware = w3.middleware_onion.middleware
+        ns = cls(cast("BaseProvider", provider), addr=addr, middleware=middleware)
 
         # inherit strict bytes checking from w3 instance
         ns.strict_bytes_type_checking = w3.strict_bytes_type_checking

{web3-6.15.1 → web3-7.0.0b2}/ens/utils.py

@@ -5,7 +5,6 @@ from datetime import (
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Collection,
     Dict,
     List,
@@ -60,15 +59,15 @@ if TYPE_CHECKING:
         AsyncWeb3,
         Web3 as _Web3,
     )
+    from web3.middleware.base import (
+        Middleware,
+    )
     from web3.providers import (  # noqa: F401
         AsyncBaseProvider,
         BaseProvider,
     )
     from web3.types import (  # noqa: F401
         ABIFunction,
-        AsyncMiddleware,
-        Middleware,
-        RPCEndpoint,
     )
 
 
@@ -82,7 +81,7 @@ def Web3() -> Type["_Web3"]:
 
 def init_web3(
     provider: "BaseProvider" = cast("BaseProvider", default),
-    middlewares: Optional[Sequence[Tuple["Middleware", str]]] = None,
+    middleware: Optional[Sequence[Tuple["Middleware", str]]] = None,
 ) -> "_Web3":
     from web3 import (
         Web3 as Web3Main,
@@ -94,23 +93,24 @@ def init_web3(
     if provider is default:
         w3 = Web3Main(ens=None, modules={"eth": (EthMain)})
     else:
-        w3 = Web3Main(provider, middlewares, ens=None, modules={"eth": (EthMain)})
+        w3 = Web3Main(provider, middleware, ens=None, modules={"eth": (EthMain)})
 
     return customize_web3(w3)
 
 
 def customize_web3(w3: "_Web3") -> "_Web3":
     from web3.middleware import (
-        make_stalecheck_middleware,
+        StalecheckMiddlewareBuilder,
     )
 
-    if w3.middleware_onion.get("name_to_address"):
-        w3.middleware_onion.remove("name_to_address")
+    if w3.middleware_onion.get("ens_name_to_address"):
+        w3.middleware_onion.remove("ens_name_to_address")
 
     if not w3.middleware_onion.get("stalecheck"):
-        w3.middleware_onion.add(
-            make_stalecheck_middleware(ACCEPTABLE_STALE_HOURS * 3600), name="stalecheck"
+        stalecheck_middleware = StalecheckMiddlewareBuilder.build(
+            ACCEPTABLE_STALE_HOURS * 3600
         )
+        w3.middleware_onion.add(stalecheck_middleware, name="stalecheck")
     return w3
 
 
@@ -299,7 +299,7 @@ def get_abi_output_types(abi: "ABIFunction") -> List[str]:
 
 def init_async_web3(
     provider: "AsyncBaseProvider" = cast("AsyncBaseProvider", default),
-    middlewares: Optional[Sequence[Tuple["AsyncMiddleware", str]]] = (),
+    middleware: Optional[Sequence[Tuple["Middleware", str]]] = (),
 ) -> "AsyncWeb3":
     from web3 import (
         AsyncWeb3 as AsyncWeb3Main,
@@ -307,36 +307,33 @@ def init_async_web3(
     from web3.eth import (
         AsyncEth as AsyncEthMain,
     )
+    from web3.middleware import (
+        StalecheckMiddlewareBuilder,
+    )
 
-    middlewares = list(middlewares)
-    for i, (middleware, name) in enumerate(middlewares):
-        if name == "name_to_address":
-            middlewares.pop(i)
+    middleware = list(middleware)
+    for i, (mw, name) in enumerate(middleware):
+        if name == "ens_name_to_address":
+            middleware.pop(i)
 
-    if "stalecheck" not in (name for mw, name in middlewares):
-        middlewares.append((_async_ens_stalecheck_middleware, "stalecheck"))
+    if "stalecheck" not in (name for mw, name in middleware):
+        middleware.append(
+            (
+                StalecheckMiddlewareBuilder.build(ACCEPTABLE_STALE_HOURS * 3600),
+                "stalecheck",
+            )
+        )
 
     if provider is default:
         async_w3 = AsyncWeb3Main(
-            middlewares=middlewares, ens=None, modules={"eth": (AsyncEthMain)}
+            middleware=middleware, ens=None, modules={"eth": (AsyncEthMain)}
         )
     else:
         async_w3 = AsyncWeb3Main(
             provider,
-            middlewares=middlewares,
+            middleware=middleware,
             ens=None,
             modules={"eth": (AsyncEthMain)},
         )
 
     return async_w3
-
-
-async def _async_ens_stalecheck_middleware(
-    make_request: Callable[["RPCEndpoint", Any], Any], w3: "AsyncWeb3"
-) -> "Middleware":
-    from web3.middleware import (
-        async_make_stalecheck_middleware,
-    )
-
-    middleware = await async_make_stalecheck_middleware(ACCEPTABLE_STALE_HOURS * 3600)
-    return await middleware(make_request, w3)

{web3-6.15.1 → web3-7.0.0b2}/setup.py

@@ -6,8 +6,8 @@ from setuptools import (
 
 extras_require = {
     "tester": [
-        "eth-tester[py-evm]==v0.9.1-b.2",
-        "py-geth>=3.14.0",
+        "eth-tester[py-evm]==v0.10.0-b.3",
+        "py-geth>=4.1.0",
     ],
     "linter": [
         "black>=22.1.0",
@@ -16,7 +16,6 @@ extras_require = {
         "mypy==1.4.1",
         "types-setuptools>=57.4.4",
         "types-requests>=2.26.1",
-        "types-protobuf==3.19.13",
     ],
     "docs": [
         "sphinx>=5.3.0",
@@ -37,19 +36,14 @@ extras_require = {
         "tox>=3.18.0",
         "tqdm>4.32",
         "twine>=1.13",
-        "when-changed>=0.3.0",
         "build>=0.9.0",
     ],
-    "ipfs": [
-        "ipfshttpclient==0.8.0a2",
-    ],
 }
 
 extras_require["dev"] = (
     extras_require["tester"]
     + extras_require["linter"]
     + extras_require["docs"]
-    + extras_require["ipfs"]
     + extras_require["dev"]
 )
 
@@ -59,7 +53,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
-    version="6.15.1",
+    version="7.0.0-beta.2",
     description="""web3.py""",
     long_description_content_type="text/markdown",
     long_description=long_description,
@@ -73,21 +67,18 @@ setup(
         "eth-account>=0.8.0",
         "eth-hash[pycryptodome]>=0.5.1",
         "eth-typing>=3.0.0",
-        "eth-utils>=2.1.0",
+        "eth-utils>=4.0.0",
         "hexbytes>=0.1.0,<0.4.0",
-        "jsonschema>=4.0.0",
-        "lru-dict>=1.1.6,<1.3.0",
-        "protobuf>=4.21.6",
+        "pydantic>=2.4.0",
         "pywin32>=223;platform_system=='Windows'",
         "requests>=2.16.0",
         "typing-extensions>=4.0.1",
         "websockets>=10.0.0",
         "pyunormalize>=15.0.0",
     ],
-    python_requires=">=3.7.2",
+    python_requires=">=3.8",
     extras_require=extras_require,
-    py_modules=["web3", "ens", "ethpm"],
-    entry_points={"pytest11": ["pytest_ethereum = web3.tools.pytest_ethereum.plugins"]},
+    py_modules=["web3", "ens"],
     license="MIT",
     zip_safe=False,
     keywords="ethereum",
@@ -99,7 +90,6 @@ setup(
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

{web3-6.15.1 → web3-7.0.0b2}/web3/__init__.py

@@ -15,8 +15,10 @@ from web3.main import (
     AsyncWeb3,
     Web3,
 )
-from web3.providers.async_rpc import (  # noqa: E402
-    AsyncHTTPProvider,
+from web3.providers.persistent import (  # noqa: E402
+    AsyncIPCProvider,
+    PersistentConnectionProvider,
+    WebSocketProvider,
 )
 from web3.providers.eth_tester import (  # noqa: E402
     EthereumTesterProvider,
@@ -25,11 +27,11 @@ from web3.providers.ipc import (  # noqa: E402
     IPCProvider,
 )
 from web3.providers.rpc import (  # noqa: E402
+    AsyncHTTPProvider,
     HTTPProvider,
 )
-from web3.providers.websocket import (  # noqa: E402
-    WebsocketProvider,
-    WebsocketProviderV2,
+from web3.providers.legacy_websocket import (  # noqa: E402
+    LegacyWebSocketProvider,
 )
 
 
@@ -39,9 +41,10 @@ __all__ = [
     "Web3",
     "HTTPProvider",
     "IPCProvider",
-    "WebsocketProvider",
-    "WebsocketProviderV2",
+    "LegacyWebSocketProvider",
+    "WebSocketProvider",
     "EthereumTesterProvider",
     "Account",
     "AsyncHTTPProvider",
+    "AsyncIPCProvider",
 ]

{web3-6.15.1 → web3-7.0.0b2}/web3/_utils/abi.py

@@ -51,7 +51,6 @@ from eth_typing import (
     TypeStr,
 )
 from eth_utils import (
-    combomethod,
     decode_hex,
     is_bytes,
     is_list_like,
@@ -211,10 +210,7 @@ class AcceptsHexStrEncoder(encoding.BaseEncoder):
     ) -> None:
         super().__init__(**kwargs)
         self.subencoder = subencoder
-
-    @property
-    def is_dynamic(self) -> bool:
-        return self.subencoder.is_dynamic
+        self.is_dynamic = subencoder.is_dynamic
 
     @classmethod
     def from_type_str(
@@ -234,10 +230,9 @@ class AcceptsHexStrEncoder(encoding.BaseEncoder):
             raise AttributeError(f"No subencoder class is set. {cls.__name__}")
         return cls.subencoder_cls
 
-    @combomethod
     def validate_value(self, value: Any) -> None:
         normalized_value = self.validate_and_normalize(value)
-        return self.subencoder.validate_value(normalized_value)
+        self.subencoder.validate_value(normalized_value)
 
     def encode(self, value: Any) -> bytes:
         normalized_value = self.validate_and_normalize(value)
@@ -308,15 +303,14 @@ class ExactLengthBytesEncoder(BytesEncoder):
             raise ValueError("Value byte size exceeds data size")
 
     @parse_type_str("bytes")
-    def from_type_str(cls, abi_type: BasicType, registry: ABIRegistry) -> bytes:
+    def from_type_str(
+        cls, abi_type: BasicType, registry: ABIRegistry
+    ) -> "ExactLengthBytesEncoder":
         subencoder_cls = cls.get_subencoder_class()
-        # cast b/c expects BaseCoder but `from_type_string`
-        # restricted to BaseEncoder subclasses
-        subencoder = cast(
-            encoding.BaseEncoder,
-            subencoder_cls.from_type_str(abi_type.to_type_str(), registry),
-        )
-        return cls(
+        subencoder = subencoder_cls.from_type_str(abi_type.to_type_str(), registry)
+        # type ignored b/c @parse_type_str decorator turns it into a classmethod,
+        # so mypy thinks cls(...) is a call to __call__, but actually calls __init__
+        return cls(  # type: ignore
             subencoder,
             value_bit_size=abi_type.sub * 8,
             data_byte_size=abi_type.sub,