web3 6.20.0__tar.gz → 6.20.2__tar.gz

{web3-6.20.0 → web3-6.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 6.20.0
+Version: 6.20.2
 Summary: web3.py
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -24,8 +24,8 @@ Requires-Dist: aiohttp>=3.7.4.post0
 Requires-Dist: eth-abi>=4.0.0
 Requires-Dist: eth-account<0.13,>=0.8.0
 Requires-Dist: eth-hash[pycryptodome]>=0.5.1
-Requires-Dist: eth-typing!=4.2.0,>=3.0.0
-Requires-Dist: eth-utils>=2.1.0
+Requires-Dist: eth-typing!=4.2.0,<5.0.0,>=3.0.0
+Requires-Dist: eth-utils<5,>=2.1.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
@@ -38,7 +38,7 @@ Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
 Requires-Dist: eth-tester[py-evm]<0.10.0b1,>=0.9.0b1; python_version <= "3.7" and extra == "tester"
 Requires-Dist: eth-tester[py-evm]<0.12.0b1,>=0.11.0b1; python_version > "3.7" and extra == "tester"
-Requires-Dist: py-geth>=3.14.0; extra == "tester"
+Requires-Dist: py-geth<4,>=3.14.0; extra == "tester"
 Provides-Extra: docs
 Requires-Dist: sphinx>=5.3.0; extra == "docs"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "docs"
@@ -46,7 +46,7 @@ Requires-Dist: towncrier<22,>=21; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: eth-tester[py-evm]<0.10.0b1,>=0.9.0b1; python_version <= "3.7" and extra == "dev"
 Requires-Dist: eth-tester[py-evm]<0.12.0b1,>=0.11.0b1; python_version > "3.7" and extra == "dev"
-Requires-Dist: py-geth>=3.14.0; extra == "dev"
+Requires-Dist: py-geth<4,>=3.14.0; 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"

{web3-6.20.0 → web3-6.20.2}/setup.py

@@ -8,7 +8,7 @@ extras_require = {
     "tester": [
         "eth-tester[py-evm]>=0.9.0b1,<0.10.0b1; python_version <= '3.7'",
         "eth-tester[py-evm]>=0.11.0b1,<0.12.0b1; python_version > '3.7'",
-        "py-geth>=3.14.0",
+        "py-geth>=3.14.0,<4",
     ],
     "docs": [
         "sphinx>=5.3.0",
@@ -51,7 +51,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
-    version="6.20.0",
+    version="6.20.2",
     description="""web3.py""",
     long_description_content_type="text/markdown",
     long_description=long_description,
@@ -64,8 +64,8 @@ setup(
         "eth-abi>=4.0.0",
         "eth-account>=0.8.0,<0.13",
         "eth-hash[pycryptodome]>=0.5.1",
-        "eth-typing>=3.0.0,!=4.2.0",
-        "eth-utils>=2.1.0",
+        "eth-typing>=3.0.0,!=4.2.0,<5.0.0",
+        "eth-utils>=2.1.0,<5",
         "hexbytes>=0.1.0,<0.4.0",
         "jsonschema>=4.0.0",
         "lru-dict>=1.1.6,<1.3.0",

{web3-6.20.0 → web3-6.20.2}/web3/_utils/module_testing/module_testing_utils.py

@@ -1,6 +1,3 @@
-from collections import (
-    deque,
-)
 import pytest
 import time
 from typing import (
@@ -9,6 +6,7 @@ from typing import (
     Collection,
     Dict,
     Generator,
+    Optional,
     Sequence,
     Union,
 )
@@ -35,6 +33,7 @@ from web3._utils.compat import (
 )
 from web3._utils.request import (
     async_cache_and_return_session,
+    asyncio,
     cache_and_return_session,
 )
 from web3.types import (
@@ -188,9 +187,13 @@ class WebsocketMessageStreamMock:
     closed: bool = False
 
     def __init__(
-        self, messages: Collection[bytes] = None, raise_exception: Exception = None
+        self,
+        messages: Optional[Collection[bytes]] = None,
+        raise_exception: Optional[Exception] = None,
     ) -> None:
-        self.messages = deque(messages) if messages else deque()
+        self.queue = asyncio.Queue()  # type: ignore  # py38 issue
+        for msg in messages or []:
+            self.queue.put_nowait(msg)
         self.raise_exception = raise_exception
 
     def __await__(self) -> Generator[Any, Any, "Self"]:
@@ -203,13 +206,13 @@ class WebsocketMessageStreamMock:
         return self
 
     async def __anext__(self) -> bytes:
+        return await self.recv()
+
+    async def recv(self) -> bytes:
         if self.raise_exception:
             raise self.raise_exception
 
-        elif len(self.messages) == 0:
-            raise StopAsyncIteration
-
-        return self.messages.popleft()
+        return await self.queue.get()
 
     @staticmethod
     async def pong() -> Literal[False]:

{web3-6.20.0 → web3-6.20.2}/web3/providers/persistent.py

@@ -9,6 +9,7 @@ from typing import (
 
 from websockets import (
     ConnectionClosed,
+    ConnectionClosedOK,
     WebSocketClientProtocol,
     WebSocketException,
 )
@@ -142,6 +143,12 @@ class PersistentConnectionProvider(AsyncJSONBaseProvider, ABC):
             await asyncio.sleep(0)
             try:
                 await self._provider_specific_message_listener()
+            except ConnectionClosedOK:
+                # RequestManager._ws_message_stream() will rethrow this exception and
+                # cause WebsocketConnection to stop the process_subscriptions() loop,
+                # or raise ConnectionClosedOK when recv() is called.
+                # see: https://github.com/ethereum/web3.py/pull/3424
+                raise
             except Exception as e:
                 if not self.silence_listener_task_exceptions:
                     raise e
@@ -184,10 +191,6 @@ class PersistentConnectionProvider(AsyncJSONBaseProvider, ABC):
             request_cache_key = generate_cache_key(request_id)
 
             while True:
-                # check if an exception was recorded in the listener task and raise it
-                # in the main loop if so
-                self._handle_listener_task_exceptions()
-
                 if request_cache_key in self._request_processor._request_response_cache:
                     self.logger.debug(
                         f"Popping response for id {request_id} from cache."
@@ -197,6 +200,9 @@ class PersistentConnectionProvider(AsyncJSONBaseProvider, ABC):
                     )
                     return popped_response
                 else:
+                    # check if an exception was recorded in the listener task and raise
+                    # it in the main loop if so
+                    self._handle_listener_task_exceptions()
                     await asyncio.sleep(0)
 
         try:

{web3-6.20.0 → web3-6.20.2}/web3/providers/websocket/websocket_v2.py

@@ -136,9 +136,8 @@ class WebsocketProviderV2(PersistentConnectionProvider):
         return response
 
     async def _provider_specific_message_listener(self) -> None:
-        async for raw_message in self._ws:
-            await asyncio.sleep(0)
-
+        while True:
+            raw_message = await self._ws.recv()
             response = json.loads(raw_message)
             subscription = response.get("method") == "eth_subscription"
             await self._request_processor.cache_raw_response(

{web3-6.20.0 → web3-6.20.2}/web3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: web3
-Version: 6.20.0
+Version: 6.20.2
 Summary: web3.py
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -24,8 +24,8 @@ Requires-Dist: aiohttp>=3.7.4.post0
 Requires-Dist: eth-abi>=4.0.0
 Requires-Dist: eth-account<0.13,>=0.8.0
 Requires-Dist: eth-hash[pycryptodome]>=0.5.1
-Requires-Dist: eth-typing!=4.2.0,>=3.0.0
-Requires-Dist: eth-utils>=2.1.0
+Requires-Dist: eth-typing!=4.2.0,<5.0.0,>=3.0.0
+Requires-Dist: eth-utils<5,>=2.1.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
@@ -38,7 +38,7 @@ Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
 Requires-Dist: eth-tester[py-evm]<0.10.0b1,>=0.9.0b1; python_version <= "3.7" and extra == "tester"
 Requires-Dist: eth-tester[py-evm]<0.12.0b1,>=0.11.0b1; python_version > "3.7" and extra == "tester"
-Requires-Dist: py-geth>=3.14.0; extra == "tester"
+Requires-Dist: py-geth<4,>=3.14.0; extra == "tester"
 Provides-Extra: docs
 Requires-Dist: sphinx>=5.3.0; extra == "docs"
 Requires-Dist: sphinx_rtd_theme>=1.0.0; extra == "docs"
@@ -46,7 +46,7 @@ Requires-Dist: towncrier<22,>=21; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: eth-tester[py-evm]<0.10.0b1,>=0.9.0b1; python_version <= "3.7" and extra == "dev"
 Requires-Dist: eth-tester[py-evm]<0.12.0b1,>=0.11.0b1; python_version > "3.7" and extra == "dev"
-Requires-Dist: py-geth>=3.14.0; extra == "dev"
+Requires-Dist: py-geth<4,>=3.14.0; 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"

{web3-6.20.0 → web3-6.20.2}/web3.egg-info/requires.txt

@@ -2,8 +2,8 @@ aiohttp>=3.7.4.post0
 eth-abi>=4.0.0
 eth-account<0.13,>=0.8.0
 eth-hash[pycryptodome]>=0.5.1
-eth-typing!=4.2.0,>=3.0.0
-eth-utils>=2.1.0
+eth-typing!=4.2.0,<5.0.0,>=3.0.0
+eth-utils<5,>=2.1.0
 hexbytes<0.4.0,>=0.1.0
 jsonschema>=4.0.0
 lru-dict<1.3.0,>=1.1.6
@@ -17,7 +17,7 @@ pyunormalize>=15.0.0
 pywin32>=223
 
 [dev]
-py-geth>=3.14.0
+py-geth<4,>=3.14.0
 sphinx>=5.3.0
 sphinx_rtd_theme>=1.0.0
 towncrier<22,>=21
@@ -56,7 +56,7 @@ towncrier<22,>=21
 ipfshttpclient==0.8.0a2
 
 [tester]
-py-geth>=3.14.0
+py-geth<4,>=3.14.0
 
 [tester:python_version <= "3.7"]
 eth-tester[py-evm]<0.10.0b1,>=0.9.0b1