Merge branch 'main' into method-formatters

Author: BobTheBuidler

.circleci/config.yml

@@ -4,7 +4,7 @@ parameters:
   # NOTE: Do not update the `geth_version` manually. It is updated during the
   # integration test fixture generation.
   geth_version:
-    default: "1.15.5"
+    default: "1.15.11"
     type: string
   go_version:
     default: "1.24.1"

docs/contributing.rst

@@ -160,6 +160,7 @@ Within the ``pytest`` scope, :file:`conftest.py` files are used for common code
 shared between modules that exist within the same directory as that particular
 :file:`conftest.py` file.
 
+
 Unit Testing and eth-tester Tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -200,6 +201,16 @@ tests are written across different files within ``/web3/_utils/module_testing``.
   client-and-provider-specific test configurations exist. This is mostly used to
   override tests specific to the provider type for the respective client.
 
+The integration tests are each run in insolation to prevent muddied contexts. Because
+they are run in isolation, they can be parallelized with ``pytest-xdist`` in order to
+speed up the test suite. To run the tests in parallel, you can use the ``-n`` flag
+with ``pytest``. For example, to run the tests in parallel with 4 workers, you can
+use the following command:
+
+.. code:: sh
+
+    $ pytest tests/integration/go_ethereum/path/to/module/or/test -n 4
+
 
 Working With Test Contracts
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -365,13 +376,13 @@ Geth Fixtures
 
    .. code:: sh
 
-      $ python -m geth.install v1.15.5
+      $ python -m geth.install v1.15.11
 
 2. Specify the Geth binary and run the fixture creation script (from within the web3.py directory):
 
    .. code:: sh
 
-      $ GETH_BINARY=~/.py-geth/geth-v1.15.5/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py
+      $ GETH_BINARY=~/.py-geth/geth-v1.15.11/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py
 
 3. The output of this script is your fixture, a zip file, which is now stored in ``/tests/integration/``.
    The ``/tests/integration/go_ethereum/conftest.py`` and

docs/ens_overview.rst

@@ -11,17 +11,6 @@ The :mod:`ens` module is included with web3.py. It provides an interface to look
 domains and addresses, add resolver records, or get and set metadata.
 
 
-.. note::
-
-    web3.py ``v6.6.0`` introduced ENS name normalization standard
-    `ENSIP-15 <https://docs.ens.domains/ensip/15>`_.
-    This update to ENS name validation and normalization won't affect ~99%
-    of names but may prevent invalid names from being created and from interacting with
-    the ENS contracts via web3.py. We feel strongly that this change, though breaking,
-    is in the best interest of our users as it ensures compatibility with the latest ENS
-    standards.
-
-
 Setup
 -----
 

docs/index.rst

@@ -39,7 +39,7 @@ Getting Started
 .. include:: toc.rst
 
 
-.. _decentralized apps (dapps): https://ethereum.org/dapps/
+.. _decentralized apps (dapps): https://ethereum.org/en/dapps/
 .. _@EthereumPython: https://twitter.com/EthereumPython
 .. _blog: https://snakecharmers.ethereum.org/
 .. _blog post series: https://snakecharmers.ethereum.org/a-developers-guide-to-ethereum-pt-1

docs/release_notes.rst

@@ -6,6 +6,43 @@ v7 Breaking Changes Summary
 
 .. towncrier release notes start
 
+web3.py v7.11.0 (2025-04-29)
+----------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Checks that ``PersistentConnectionProvider`` response cache value is a dict before attempting to access it like one. Also adds checks to ``make_batch_request`` to make sure it is in batching mode before being called and is not after. (`#3642 <https://github.com/ethereum/web3.py/issues/3642>`__)
+- Moves base providers' ``_is_batching`` and ``_batch_request_func_cache`` from class to instance attrs to help with thread safety. (`#3661 <https://github.com/ethereum/web3.py/issues/3661>`__)
+
+
+Features
+~~~~~~~~
+
+- Support for Prague network upgrade, mainly ``requests_hash`` and ``authorization_list`` formatters. Add support for serializing ``SignedSetCodeTransaction`` (`eth-account` pydantic model) directly added to transaction dicts. (`#3659 <https://github.com/ethereum/web3.py/issues/3659>`__)
+- Allow setting the ``request_information_cache_size`` for ``PersistentConnectionProvider`` implementations. (`#3662 <https://github.com/ethereum/web3.py/issues/3662>`__)
+
+
+Internal Changes - for web3.py Contributors
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Update some outdated TODO notes in code & remove old un-tested uncles tests as no longer relevant post-merge. (`#3605 <https://github.com/ethereum/web3.py/issues/3605>`__)
+- Run each integration test in isolation and parallelize, instead of running them all within a single `geth` (for example) process. This prevents muddied test contexts. (`#3659 <https://github.com/ethereum/web3.py/issues/3659>`__)
+- Bound hypothesis integers in some tests to a max of uint256 value (`#3665 <https://github.com/ethereum/web3.py/issues/3665>`__)
+- AsyncENS tests were xfailing for the wrong reason. (`#3675 <https://github.com/ethereum/web3.py/issues/3675>`__)
+
+
+Performance Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Optimize performance for:
+
+  * web3._utils.utility_methods.all_in_dict
+  * web3._utils.utility_methods.any_in_dict
+  * web3._utils.utility_methods.none_in_dict (`#3667 <https://github.com/ethereum/web3.py/issues/3667>`__)
+- optimize web3._utils.rpc_abi.apply_abi_formatters_to_dict (`#3671 <https://github.com/ethereum/web3.py/issues/3671>`__)
+
+
 web3.py v7.10.0 (2025-03-27)
 ----------------------------
 

docs/web3.eth.rst

@@ -398,6 +398,8 @@ The following methods are available on the ``web3.eth`` namespace.
 
 .. py:method:: Eth.get_uncle_by_block(block_identifier, uncle_index)
 
+    .. warning:: Deprecated. Will be removed in v8.
+
     * Delegates to ``eth_getUncleByBlockHashAndIndex`` or
       ``eth_getUncleByBlockNumberAndIndex`` RPC methods
 
@@ -444,6 +446,8 @@ The following methods are available on the ``web3.eth`` namespace.
 
 .. py:method:: Eth.get_uncle_count(block_identifier)
 
+    .. warning:: Deprecated. Will be removed in v8.
+
     * Delegates to ``eth_getUncleCountByBlockHash`` or
       ``eth_getUncleCountByBlockNumber`` RPC methods
 

ens/exceptions.py

@@ -32,7 +32,7 @@ class AddressMismatch(ENSException):
 class InvalidName(idna.IDNAError, ENSException):
     """
     Raised if the provided name does not meet the normalization
-    standards specified in `ENSIP-15
+    standards specified in `ENSIP-15`
     <https://docs.ens.domains/ens-improvement-proposals/ensip-15-normalization-standard>`_.
     """
 

newsfragments/3661.bugfix.rst

@@ -0,0 +1 @@
+Deprecate eth.get_uncle* methods. Will be removed in v8.

newsfragments/3662.feature.rst

@@ -0,0 +1 @@
+Properly handle ``PersistentConnectionClosedOK`` for ``subscription_manager.handle_subscriptions()``.

newsfragments/3665.internal.rst

@@ -0,0 +1 @@
+Re-compile test contracts with new Solidity ``v0.8.30`` and re-generate integration test fixture to test against latest geth ``v1.15.11``.

newsfragments/3667.performance.rst

@@ -0,0 +1 @@
+Remove old test fixtures when generating a new test fixture.

newsfragments/3671.performance.rst

@@ -127,7 +127,7 @@ name = "Removals"
 showcontent = true
 
 [tool.bumpversion]
-current_version = "7.10.0"
+current_version = "7.11.0"
 parse = """
     (?P<major>\\d+)
     \\.(?P<minor>\\d+)

newsfragments/3683.deprecation.rst

@@ -8,7 +8,7 @@
     "tester": [
         # Note: ethereum-maintained libraries in this list should be added to the
         # `install_pre_releases.py` script.
-        "eth-tester[py-evm]>=0.12.0b1,<0.13.0b1",
+        "eth-tester[py-evm]>=0.13.0b1,<0.14.0b1",
         "py-geth>=5.1.0",
     ],
     "dev": [
@@ -55,7 +55,7 @@
 setup(
     name="web3",
     # *IMPORTANT*: Don't manually change the version here. See Contributing docs for the release process.
-    version="7.10.0",
+    version="7.11.0",
     description="""web3: A Python library for interacting with Ethereum""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -67,7 +67,7 @@
         # Note: ethereum-maintained libraries in this list should be added to the
         # `install_pre_releases.py` script.
         "eth-abi>=5.0.1",
-        "eth-account>=0.13.1",
+        "eth-account>=0.13.6",
         "eth-hash[pycryptodome]>=0.5.1",
         "eth-typing>=5.0.0",
         "eth-utils>=5.0.0",

newsfragments/3690.bugfix.rst

@@ -19,21 +19,12 @@
     RequestMocker,
 )
 
-from .utils import (
-    get_open_port,
-)
-
 
 @pytest.fixture(scope="module", params=[lambda x: to_bytes(hexstr=x), identity])
 def address_conversion_func(request):
     return request.param
 
 
-@pytest.fixture()
-def open_port():
-    return get_open_port()
-
-
 # --- session-scoped constants --- #
 
 

newsfragments/3692.internal.rst

@@ -46,6 +46,7 @@ def test_get_block_formatters_with_null_values(w3, request_mocker):
         "blobGasUsed": None,
         "excessBlobGas": None,
         "parentBeaconBlockRoot": None,
+        "requestsHash": None,
     }
     with request_mocker(w3, mock_results={"eth_getBlockByNumber": null_values_block}):
         received_block = w3.eth.get_block("pending")
@@ -109,6 +110,9 @@ def test_get_block_formatters_with_pre_formatted_values(w3, request_mocker):
         "parentBeaconBlockRoot": (
             "0x6470e77f1b8a55a49a57b3f74c2a10a76185636d65122053752ea5e4bb4dac59"
         ),
+        "requestsHash": (
+            "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+        ),
     }
 
     with request_mocker(
@@ -170,4 +174,5 @@ def test_get_block_formatters_with_pre_formatted_values(w3, request_mocker):
         "parentBeaconBlockRoot": HexBytes(
             unformatted_values_block["parentBeaconBlockRoot"]
         ),
+        "requestsHash": HexBytes(unformatted_values_block["requestsHash"]),
     }