web3 7.14.0__tar.gz → 7.14.1__tar.gz

{web3-7.14.0/web3.egg-info → web3-7.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: web3
-Version: 7.14.0
+Version: 7.14.1
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -37,7 +37,7 @@ Requires-Dist: websockets<16.0.0,>=10.0.0
 Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
 Requires-Dist: eth-tester[py-evm]<0.14.0b1,>=0.13.0b1; extra == "tester"
-Requires-Dist: py-geth>=5.1.0; extra == "tester"
+Requires-Dist: py-geth>=6.4.0; extra == "tester"
 Provides-Extra: dev
 Requires-Dist: build>=0.9.0; extra == "dev"
 Requires-Dist: bump_my_version>=0.19.0; extra == "dev"
@@ -60,7 +60,7 @@ Requires-Dist: tox>=4.0.0; extra == "dev"
 Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: pre-commit>=3.4.0; extra == "dev"
 Requires-Dist: eth-tester[py-evm]<0.14.0b1,>=0.13.0b1; extra == "dev"
-Requires-Dist: py-geth>=5.1.0; extra == "dev"
+Requires-Dist: py-geth>=6.4.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx>=6.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "docs"
@@ -77,7 +77,7 @@ Requires-Dist: tox>=4.0.0; extra == "test"
 Requires-Dist: mypy==1.10.0; extra == "test"
 Requires-Dist: pre-commit>=3.4.0; extra == "test"
 Requires-Dist: eth-tester[py-evm]<0.14.0b1,>=0.13.0b1; extra == "test"
-Requires-Dist: py-geth>=5.1.0; extra == "test"
+Requires-Dist: py-geth>=6.4.0; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{web3-7.14.0 → web3-7.14.1}/pyproject.toml

@@ -33,6 +33,10 @@ warn_return_any = false
 warn_unused_configs = true
 warn_unused_ignores = true
 
+[[tool.mypy.overrides]]
+module = "sphinx.*"
+follow_imports = "skip"
+
 [tool.pydocstyle]
 # All error codes found here:
 # http://www.pydocstyle.org/en/3.0.0/error_codes.html
@@ -127,7 +131,7 @@ name = "Removals"
 showcontent = true
 
 [tool.bumpversion]
-current_version = "7.14.0"
+current_version = "7.14.1"
 parse = """
     (?P<major>\\d+)
     \\.(?P<minor>\\d+)

{web3-7.14.0 → web3-7.14.1}/setup.py

@@ -9,7 +9,7 @@ extras_require = {
         # Note: ethereum-maintained libraries in this list should be added to the
         # `install_pre_releases.py` script.
         "eth-tester[py-evm]>=0.13.0b1,<0.14.0b1",
-        "py-geth>=5.1.0",
+        "py-geth>=6.4.0",
     ],
     "dev": [
         "build>=0.9.0",
@@ -55,7 +55,7 @@ with open("./README.md") as readme:
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. See Contributing docs for the release process.
-    version="7.14.0",
+    version="7.14.1",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",

{web3-7.14.0 → web3-7.14.1}/tests/core/contracts/test_contract_call_interface.py

@@ -1334,8 +1334,7 @@ async def async_mismatched_math_contract(
     return _mismatched_math_contract
 
 
-@pytest.fixture
-@pytest.mark.asyncio
+@pytest_asyncio.fixture
 async def test_async_deploy_raises_due_to_strict_byte_checking_by_default(
     async_w3, async_bytes_contract_factory, address_conversion_func
 ):

{web3-7.14.0 → web3-7.14.1}/tests/core/providers/test_http_provider.py

@@ -1,4 +1,6 @@
 import pytest
+import concurrent.futures
+import threading
 from unittest.mock import (
     Mock,
     patch,
@@ -133,3 +135,93 @@ def test_http_empty_batch_response(mock_post):
 
     # assert that even though there was an error, we have reset the batching state
     assert not w3.provider._is_batching
+
+
+def test_user_provided_session_shared_across_threads():
+    """
+    Test that when a user provides an explicit session to HTTPProvider,
+    that same session is used by ALL threads, not just the creating thread.
+
+    This is a regression test for:
+    https://github.com/ethereum/web3.py/issues/3789
+    """
+    shared_session = Session()
+    provider = HTTPProvider(endpoint_uri=URI, session=shared_session)
+
+    sessions_from_threads = []
+    errors = []
+
+    def get_session_from_thread():
+        try:
+            # This simulates what happens internally when a request is made
+            # from a different thread - it calls cache_and_return_session
+            session = provider._request_session_manager.cache_and_return_session(URI)
+            sessions_from_threads.append(session)
+        except Exception as e:
+            errors.append(e)
+
+    # Get session from main thread
+    main_thread_session = provider._request_session_manager.cache_and_return_session(
+        URI
+    )
+
+    # Get session from multiple different threads
+    with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+        futures = [executor.submit(get_session_from_thread) for _ in range(10)]
+        concurrent.futures.wait(futures)
+
+    assert not errors, f"Errors occurred: {errors}"
+    assert len(sessions_from_threads) == 10
+
+    # The main assertion: ALL sessions should be the SAME shared session
+    assert main_thread_session is shared_session
+    for session in sessions_from_threads:
+        assert session is shared_session, (
+            "Session from different thread should be the same as the "
+            "explicitly provided session"
+        )
+
+
+def test_no_explicit_session_creates_per_thread_sessions():
+    """
+    Test that when no explicit session is provided, each thread gets its own
+    session (the original thread-isolated behavior).
+    """
+    provider = HTTPProvider(endpoint_uri=URI)
+
+    sessions_from_threads = []
+
+    def get_session_from_thread():
+        session = provider._request_session_manager.cache_and_return_session(URI)
+        sessions_from_threads.append((threading.get_ident(), session))
+
+    # Get session from main thread
+    main_thread_id = threading.get_ident()
+    main_thread_session = provider._request_session_manager.cache_and_return_session(
+        URI
+    )
+
+    # Get sessions from different threads
+    with concurrent.futures.ThreadPoolExecutor(max_workers=3) as executor:
+        futures = [executor.submit(get_session_from_thread) for _ in range(3)]
+        concurrent.futures.wait(futures)
+
+    # Group sessions by thread ID
+    sessions_by_thread = {}
+    for thread_id, session in sessions_from_threads:
+        if thread_id not in sessions_by_thread:
+            sessions_by_thread[thread_id] = []
+        sessions_by_thread[thread_id].append(session)
+
+    # Verify thread isolation: same thread always gets the same session
+    for _, sessions in sessions_by_thread.items():
+        assert all(
+            s is sessions[0] for s in sessions
+        ), "Same thread should always get the same session"
+
+    # Verify different threads get different sessions (not the main thread's)
+    for thread_id, sessions in sessions_by_thread.items():
+        if thread_id != main_thread_id:
+            assert (
+                sessions[0] is not main_thread_session
+            ), "Different threads should have different sessions"

{web3-7.14.0 → web3-7.14.1}/tests/integration/go_ethereum/conftest.py

@@ -35,7 +35,7 @@ from .utils import (
 )
 
 KEYFILE_PW = "web3py-test"
-GETH_FIXTURE_ZIP = "geth-1.16.2-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.16.7-fixture.zip"
 
 
 @pytest.fixture

{web3-7.14.0 → web3-7.14.1}/web3/_utils/http_session_manager.py

@@ -50,9 +50,11 @@ class HTTPSessionManager:
         self,
         cache_size: int = 100,
         session_pool_max_workers: int = 5,
+        explicit_session: Optional[requests.Session] = None,
     ) -> None:
         self.session_cache = SimpleCache(cache_size)
         self.session_pool = ThreadPoolExecutor(max_workers=session_pool_max_workers)
+        self._explicit_session = explicit_session
 
     @staticmethod
     def get_default_http_endpoint() -> URI:
@@ -64,6 +66,11 @@ class HTTPSessionManager:
         session: requests.Session = None,
         request_timeout: Optional[float] = None,
     ) -> requests.Session:
+        # If an explicit session was provided at init time, always use it
+        # regardless of which thread is making the request
+        if self._explicit_session is not None:
+            return self._explicit_session
+
         # cache key should have a unique thread identifier
         cache_key = generate_cache_key(f"{threading.get_ident()}:{endpoint_uri}")
 

{web3-7.14.0 → web3-7.14.1}/web3/beacon/async_beacon.py

@@ -89,7 +89,7 @@ class AsyncBeacon:
     ) -> Dict[str, Any]:
         uri = URI(self.base_url + endpoint_uri)
         return await self._request_session_manager.async_json_make_post_request(
-            uri, json=body, timeout=self.request_timeout
+            uri, json=body, timeout=ClientTimeout(self.request_timeout)
         )
 
     # [ BEACON endpoints ]

{web3-7.14.0 → web3-7.14.1}/web3/providers/rpc/rpc.py

@@ -72,7 +72,9 @@ class HTTPProvider(JSONBaseProvider):
         **kwargs: Any,
     ) -> None:
         super().__init__(**kwargs)
-        self._request_session_manager = HTTPSessionManager()
+        # Pass explicit session to manager so it's used for ALL requests,
+        # regardless of which thread makes them
+        self._request_session_manager = HTTPSessionManager(explicit_session=session)
 
         if endpoint_uri is None:
             self.endpoint_uri = (
@@ -84,11 +86,6 @@ class HTTPProvider(JSONBaseProvider):
         self._request_kwargs = request_kwargs or {}
         self._exception_retry_configuration = exception_retry_configuration
 
-        if session:
-            self._request_session_manager.cache_and_return_session(
-                self.endpoint_uri, session
-            )
-
     def __str__(self) -> str:
         return f"RPC connection {self.endpoint_uri}"
 

{web3-7.14.0 → web3-7.14.1}/web3/types.py

@@ -156,7 +156,7 @@ class SetCodeAuthorizationParams(TypedDict):
     chainId: int
     address: Union[Address, ChecksumAddress, str]
     nonce: Nonce
-    y_parity: int
+    yParity: int
     r: int
     s: int
 
@@ -193,7 +193,7 @@ TxParams = TypedDict(
 
 class WithdrawalData(TypedDict):
     index: int
-    validator_index: int
+    validatorIndex: int
     address: ChecksumAddress
     amount: Gwei
 

{web3-7.14.0 → web3-7.14.1/web3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: web3
-Version: 7.14.0
+Version: 7.14.1
 Summary: web3: A Python library for interacting with Ethereum
 Home-page: https://github.com/ethereum/web3.py
 Author: The Ethereum Foundation
@@ -37,7 +37,7 @@ Requires-Dist: websockets<16.0.0,>=10.0.0
 Requires-Dist: pyunormalize>=15.0.0
 Provides-Extra: tester
 Requires-Dist: eth-tester[py-evm]<0.14.0b1,>=0.13.0b1; extra == "tester"
-Requires-Dist: py-geth>=5.1.0; extra == "tester"
+Requires-Dist: py-geth>=6.4.0; extra == "tester"
 Provides-Extra: dev
 Requires-Dist: build>=0.9.0; extra == "dev"
 Requires-Dist: bump_my_version>=0.19.0; extra == "dev"
@@ -60,7 +60,7 @@ Requires-Dist: tox>=4.0.0; extra == "dev"
 Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: pre-commit>=3.4.0; extra == "dev"
 Requires-Dist: eth-tester[py-evm]<0.14.0b1,>=0.13.0b1; extra == "dev"
-Requires-Dist: py-geth>=5.1.0; extra == "dev"
+Requires-Dist: py-geth>=6.4.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx>=6.0.0; extra == "docs"
 Requires-Dist: sphinx-autobuild>=2021.3.14; extra == "docs"
@@ -77,7 +77,7 @@ Requires-Dist: tox>=4.0.0; extra == "test"
 Requires-Dist: mypy==1.10.0; extra == "test"
 Requires-Dist: pre-commit>=3.4.0; extra == "test"
 Requires-Dist: eth-tester[py-evm]<0.14.0b1,>=0.13.0b1; extra == "test"
-Requires-Dist: py-geth>=5.1.0; extra == "test"
+Requires-Dist: py-geth>=6.4.0; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{web3-7.14.0 → web3-7.14.1}/web3.egg-info/SOURCES.txt

@@ -14,9 +14,11 @@ ens/contract_data.py
 ens/ens.py
 ens/exceptions.py
 ens/utils.py
+ens/specs/.DS_Store
 ens/specs/nf.json
 ens/specs/normalization_spec.json
 scripts/release/test_package.py
+tests/.DS_Store
 tests/__init__.py
 tests/conftest.py
 tests/utils.py
@@ -165,6 +167,7 @@ tests/core/web3-module/test_keccak.py
 tests/core/web3-module/test_providers.py
 tests/core/web3-module/test_strict_bytes_type_checking.py
 tests/core/web3-module/test_web3_inheritance.py
+tests/ens/.DS_Store
 tests/ens/conftest.py
 tests/ens/test_ens.py
 tests/ens/test_get_registry.py
@@ -177,10 +180,11 @@ tests/ens/test_utils.py
 tests/ens/test_wildcard_resolution.py
 tests/ens/normalization/normalization_tests.json
 tests/ens/normalization/test_normalize_name_ensip15.py
+tests/integration/.DS_Store
 tests/integration/README.md
 tests/integration/common.py
 tests/integration/conftest.py
-tests/integration/geth-1.16.2-fixture.zip
+tests/integration/geth-1.16.7-fixture.zip
 tests/integration/test_ethereum_tester.py
 tests/integration/generate_fixtures/common.py
 tests/integration/generate_fixtures/go_ethereum.py

{web3-7.14.0 → web3-7.14.1}/web3.egg-info/requires.txt

@@ -37,7 +37,7 @@ tox>=4.0.0
 mypy==1.10.0
 pre-commit>=3.4.0
 eth-tester[py-evm]<0.14.0b1,>=0.13.0b1
-py-geth>=5.1.0
+py-geth>=6.4.0
 
 [docs]
 sphinx>=6.0.0
@@ -56,8 +56,8 @@ tox>=4.0.0
 mypy==1.10.0
 pre-commit>=3.4.0
 eth-tester[py-evm]<0.14.0b1,>=0.13.0b1
-py-geth>=5.1.0
+py-geth>=6.4.0
 
 [tester]
 eth-tester[py-evm]<0.14.0b1,>=0.13.0b1
-py-geth>=5.1.0
+py-geth>=6.4.0