web3 6.20.0__py3-none-any.whl → 6.20.2__py3-none-any.whl

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/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/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.dist-info → web3-6.20.2.dist-info}/METADATA

@@ -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
@@ -36,7 +36,7 @@ Requires-Dist: websockets >=10.0.0
 Requires-Dist: pyunormalize >=15.0.0
 Requires-Dist: pywin32 >=223 ; platform_system == "Windows"
 Provides-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'
@@ -66,7 +66,7 @@ Requires-Dist: towncrier <22,>=21 ; extra == 'docs'
 Provides-Extra: ipfs
 Requires-Dist: ipfshttpclient ==0.8.0a2 ; extra == 'ipfs'
 Provides-Extra: tester
-Requires-Dist: py-geth >=3.14.0 ; extra == 'tester'
+Requires-Dist: py-geth <4,>=3.14.0 ; 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'
 

{web3-6.20.0.dist-info → web3-6.20.2.dist-info}/RECORD

@@ -195,7 +195,7 @@ web3/_utils/module_testing/eth_module.py,sha256=JQ0XAF5GlvpHn3oeAi2DfltJdCZwHk7J
 web3/_utils/module_testing/go_ethereum_admin_module.py,sha256=_c-6SyzZkfAJ-7ySXUpw9FEr4cg-ShRdAGSAHWanCtY,3406
 web3/_utils/module_testing/go_ethereum_personal_module.py,sha256=KzYEcAs_6Ud_gbu6YMOC6HijTdNFiz-qogMCViedmY0,11536
 web3/_utils/module_testing/go_ethereum_txpool_module.py,sha256=5f8XL8-2x3keyGRaITxMQYl9oQzjgqGn8zobB-j9BPs,1176
-web3/_utils/module_testing/module_testing_utils.py,sha256=_BV5xITzHC6HkOL3GD6bCJ-vhEsPQt2iSpY9S_SWXYo,6290
+web3/_utils/module_testing/module_testing_utils.py,sha256=_nqhDGaL9JwWrcLJlmnfUTHxzVJ7QPP9YSlpFbMY6jA,6383
 web3/_utils/module_testing/net_module.py,sha256=ifUTC-5fTcQbwpm0X09OdD5RSPnn00T8klFeYe8tTm4,1272
 web3/_utils/module_testing/persistent_connection_provider.py,sha256=2NFjp0ZShOt_D5gmcfrc2ua57mRyeFSZpkqtPgCNUgM,16620
 web3/_utils/module_testing/web3_module.py,sha256=Y4lYglg_kbrpfwGfjekv52h4B7DaWa3uS15KGrCKL7c,9613
@@ -243,7 +243,7 @@ web3/providers/async_rpc.py,sha256=1tf72qPH8A3IW2ZJus9nORL-PfPgRtmj1YRFASVWyuM,2
 web3/providers/auto.py,sha256=-dS_-2nhg2jOA432P0w3Ul3NUIso8rTl4uGUGo0XBw0,3447
 web3/providers/base.py,sha256=qASmfdhXhD2FSk2Uk8z-8NxVL4i42uJNoUlwRDzQpgI,4187
 web3/providers/ipc.py,sha256=xFWT6cY9emTnFMuIQFrmQ0DJMQSMoQtaztD7MTTVniI,6374
-web3/providers/persistent.py,sha256=L9Cgs3RxcUmplo3-mnDl9U0VlzMWfXZSVMWtWMjS0bY,8376
+web3/providers/persistent.py,sha256=eSZy825cAV2beVNytcrmCMsjgoAzsa3G-nW00pI8F0M,8782
 web3/providers/rpc.py,sha256=w3XA8lhufp_tcGCqocRwi2DDt8j3fj0hoZGk0dfF0u0,2686
 web3/providers/eth_tester/__init__.py,sha256=J6wazY3hQySsUfpFgwCXbEMo-CGEZjRo11RCg4UXKmA,83
 web3/providers/eth_tester/defaults.py,sha256=Ri_WPJT8aumxwiZXwedkJ16H_gBkLsKqanlDLfeFqM8,14803
@@ -253,7 +253,7 @@ web3/providers/websocket/__init__.py,sha256=W5xi6NxUVaskom7k03vd2HCXSH8hXAob2ry-
 web3/providers/websocket/request_processor.py,sha256=kir6bkAWy6CQdBpNrk_8CB8GPsjXM42SXx7IYlAngqE,11653
 web3/providers/websocket/websocket.py,sha256=-U2-CGtqpysxZoFHsa-rBeZKjSRejqQSeb5Z12SzKwk,3929
 web3/providers/websocket/websocket_connection.py,sha256=_W3i_nF9NNRdSwFGwLsDCNXrrhlhV-NvmywX8vbuWvY,1104
-web3/providers/websocket/websocket_v2.py,sha256=HX-p1CATh2eA02H0vbKh33XQdahoiSp5RH8uUoXzndY,4402
+web3/providers/websocket/websocket_v2.py,sha256=oVyNeUH7r-RFMy7whLFVRGKhhAC2GIvI6-q5NjlHmjQ,4391
 web3/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web3/scripts/release/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web3/scripts/release/test_package.py,sha256=DH0AryllcF4zfpWSd0NLPSQGHNoC-Qng5WYYbS5_4c8,1534
@@ -275,9 +275,9 @@ web3/utils/address.py,sha256=KC_IpEbixSCuMhaW6V2QCyyJTYKYGS9c8QtI9_aH7zQ,967
 web3/utils/async_exception_handling.py,sha256=gfLuzP7Y5rc21jZVjWEYAOZUMJkJd9CmsL297UKReow,3096
 web3/utils/caching.py,sha256=PgfuXiVgPYQuS0S89-jkNOJ3L2uTRt2MkVBvzMkaAXI,1770
 web3/utils/exception_handling.py,sha256=12xkzIqMAOx0Jcm6PYL98PmWlLPKFll0p9YoLGS_ZNg,3052
-web3-6.20.0.dist-info/LICENSE,sha256=ulnXiEqqFp9VyWe8yMFdtDi70RMBJk3mpY3FKujv6l8,1090
-web3-6.20.0.dist-info/METADATA,sha256=cC9L2SF3-lO9WL9ziLUD6ugwlOPokbWQeeJL_IN2ou4,4522
-web3-6.20.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-web3-6.20.0.dist-info/entry_points.txt,sha256=2qjzGxFUlYBzoP68fcB3AJyMRunWI70uBoxNp17Brb0,64
-web3-6.20.0.dist-info/top_level.txt,sha256=5lRZg30BFUrz8eUK60C7OAjNT3FI4YsGmA-vZ0WIOik,15
-web3-6.20.0.dist-info/RECORD,,
+web3-6.20.2.dist-info/LICENSE,sha256=ulnXiEqqFp9VyWe8yMFdtDi70RMBJk3mpY3FKujv6l8,1090
+web3-6.20.2.dist-info/METADATA,sha256=HAI2cD-mXi-yXC88_xZQ51_yyyM34nNogWWyrVOcEdw,4538
+web3-6.20.2.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+web3-6.20.2.dist-info/entry_points.txt,sha256=2qjzGxFUlYBzoP68fcB3AJyMRunWI70uBoxNp17Brb0,64
+web3-6.20.2.dist-info/top_level.txt,sha256=5lRZg30BFUrz8eUK60C7OAjNT3FI4YsGmA-vZ0WIOik,15
+web3-6.20.2.dist-info/RECORD,,

{web3-6.20.0.dist-info → web3-6.20.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any