Deprecate Geth miner namespace

.circleci/config.yml

@@ -3,11 +3,11 @@ version: 2.1
 parameters:
   geth_version:
     # update default value when updating geth integration test fixture
-    default: "v1.11.6"
+    default: "v1.13.11"
     type: string
   pygeth_version:
     # update default value when updating geth integration test fixture
-    default: "3.13.0"
+    default: "4.3.0"
     type: string
   go_version:
     default: "1.20.2"
@@ -107,7 +107,6 @@ geth_steps: &geth_steps
           fi
           sudo ln -s /home/circleci/.py-geth/geth-<< pipeline.parameters.geth_version >>/bin/geth /usr/local/bin/geth
           geth version
-          geth makedag 0 $HOME/.ethash
     - run:
         name: run tox
         command: python -m tox -r
@@ -148,7 +147,6 @@ geth_custom_steps: &geth_custom_steps
           sudo apt-get update;
           sudo apt-get install -y build-essential;
           ./custom_geth version
-          ./custom_geth makedag 0 $HOME/.ethash
     - run:
         name: run tox
         command: python -m tox -r
@@ -236,140 +234,6 @@ jobs:
     environment:
       TOXENV: docs
 
-
-  #
-  # Python 3.7
-  #
-  py37-core:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-core
-
-  py37-core_async:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-core_async
-
-  py37-ens:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-ens
-
-  py37-ensip15:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-ensip15
-
-  py37-ethpm:
-    <<: *ethpm_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-ethpm
-      # Please don't use this key for any shenanigans
-      WEB3_INFURA_PROJECT_ID: $WEB3_INFURA_PROJECT_ID
-
-  py37-integration-goethereum-ipc:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ipc
-
-  py37-integration-goethereum-ipc_flaky:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ipc_flaky
-
-  py37-integration-goethereum-http:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-http
-
-  py37-integration-goethereum-http_async:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-http_async
-
-  py37-integration-goethereum-http_async_flaky:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-http_async_flaky
-
-  py37-integration-goethereum-http_flaky:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-http_flaky
-
-  py37-integration-goethereum-ws:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ws
-
-  py37-integration-goethereum-ws_flaky:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ws_flaky
-
-  py37-integration-goethereum-ws-v2:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ws_v2
-
-  py37-integration-goethereum-ws-v2_flaky:
-    <<: *geth_steps
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-goethereum-ws_v2_flaky
-
-  py37-integration-ethtester-pyevm:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-ethtester
-      ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend
-
-  py37-integration-ethtester-pyevm_flaky:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-integration-ethtester_flaky
-      ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend
-
-  py37-wheel-cli:
-    <<: *common
-    docker:
-      - image: cimg/python:3.7
-    environment:
-      TOXENV: py37-wheel-cli
-
   #
   # Python 3.8
   #
@@ -945,34 +809,16 @@ workflows:
   test:
     jobs:
       # These are the longest running tests, start them first
-      - py37-core
       - py38-core
       - py39-core
       - py310-core
       - py311-core
-      - py37-core_async
       - py38-core_async
       - py39-core_async
       - py310-core_async
       - py311-core_async
       - docs
       - benchmark
-      - py37-ens
-      - py37-ensip15
-      - py37-ethpm
-      - py37-integration-goethereum-ipc
-      - py37-integration-goethereum-ipc_flaky
-      - py37-integration-goethereum-http
-      - py37-integration-goethereum-http_async
-      - py37-integration-goethereum-http_async_flaky
-      - py37-integration-goethereum-http_flaky
-      - py37-integration-goethereum-ws
-      - py37-integration-goethereum-ws_flaky
-      - py37-integration-goethereum-ws-v2
-      - py37-integration-goethereum-ws-v2_flaky
-      - py37-integration-ethtester-pyevm
-      - py37-integration-ethtester-pyevm_flaky
-      - py37-wheel-cli
       - py38-lint
       - py38-ens
       - py38-ensip15

.gitignore

@@ -49,6 +49,7 @@ docs/web3.gas_strategies.rst
 docs/web3.middleware.rst
 docs/web3.providers.eth_tester.rst
 docs/web3.providers.rst
+docs/web3.providers.rpc.rst
 docs/web3.providers.websocket.rst
 docs/web3.rst
 docs/web3.scripts.release.rst

.isort.cfg

@@ -9,7 +9,7 @@ force_sort_within_sections=true
 include_trailing_comma=true
 extra_standard_library=pytest
 known_first_party=web3,ens,ethpm
-known_third_party=lru,eth_tester
+known_third_party=eth_tester
 line_length=88
 use_parentheses=true
 # skip `__init__.py` files because sometimes order of initialization is important

README.md

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

docs/conf.py

@@ -86,6 +86,7 @@
     "web3.gas_strategies.rst",
     "web3.middleware.rst",
     "web3.providers.rst",
+    "web3.providers.rpc.rst",
     "web3.providers.websocket.rst",
     "web3.providers.eth_tester.rst",
     "web3.scripts.*",
@@ -224,7 +225,13 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ("index", "Populus.tex", "Populus Documentation", "The Ethereum Foundation", "manual"),
+    (
+        "index",
+        "Populus.tex",
+        "Populus Documentation",
+        "The Ethereum Foundation",
+        "manual",
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

docs/contributing.rst

@@ -164,7 +164,7 @@ You can use ``tox`` to run all the tests for a given version of Python:
 
 .. code:: sh
 
-   $ tox -e py37-core
+   $ tox -e py38-core
 
 
 Linting is also performed by the CI. You can save yourself some time by checking for
@@ -373,13 +373,13 @@ Geth Fixtures
 
    .. code:: sh
 
-       $ python -m geth.install v1.11.6
+       $ python -m geth.install v1.13.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.11.6/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.11.6-fixture
+       $ GETH_BINARY=~/.py-geth/geth-v1.13.11/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py ./tests/integration/geth-1.13.11-fixture
 
 3. The output of this script is your fixture, a zip file, which is now stored in ``/tests/integration/``.
    Update the ``/tests/integration/go_ethereum/conftest.py`` and

docs/examples.rst

@@ -181,7 +181,7 @@ There are a few options for sending transactions:
 - :meth:`~web3.eth.Eth.send_transaction`
 - :meth:`~web3.eth.Eth.send_raw_transaction`
 - Calling :meth:`~web3.contract.ContractFunction.transact` on a contract function
-- Utilizing :meth:`~web3.middleware.construct_sign_and_send_raw_middleware`
+- Configuring the sign-and-send middleware :class:`~web3.middleware.SignAndSendRawMiddlewareBuilder`
 
 For more context, see the :doc:`transactions` Guide.
 
@@ -688,8 +688,8 @@ Inject the middleware into the middleware onion
 
 .. code-block:: python
 
-    from web3.middleware import geth_poa_middleware
-    w3.middleware_onion.inject(geth_poa_middleware, layer=0)
+    from web3.middleware import ExtraDataToPOAMiddleware
+    w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
 
 Just remember that you have to sign all transactions locally, as infura does not handle any keys from your wallet ( refer to `this`_  )
 
@@ -797,7 +797,7 @@ The following example code is divided into a reusable ``EventScanner`` class and
 
 * only supports ``HTTPS`` providers, because JSON-RPC retry logic depends on the implementation details of the underlying protocol,
 
-* disables the standard ``http_retry_request_middleware`` because it does not know how to handle the shrinking block range window for ``eth_getLogs``, and
+* disables the default exception retry configuration because it does not know how to handle the shrinking block range window for ``eth_getLogs``, and
 
 * consumes around 20k JSON-RPC API calls.
 
@@ -886,7 +886,7 @@ The script can be run with: ``python ./eventscanner.py <your JSON-RPC API URL>``
         Unlike the easy web3.contract.Contract, this scanner can scan events from multiple contracts at once.
         For example, you can get all transfers from all tokens in the same scan.
 
-        You *should* disable the default `http_retry_request_middleware` on your provider for Web3,
+        You *should* disable the default ``exception_retry_configuration`` on your provider for Web3,
         because it cannot correctly throttle and decrease the `eth_getLogs` block number range.
         """
 
@@ -1373,10 +1373,9 @@ The script can be run with: ``python ./eventscanner.py <your JSON-RPC API URL>``
 
             provider = HTTPProvider(api_url)
 
-            # Remove the default JSON-RPC retry middleware
+            # Disable the default JSON-RPC retry configuration
             # as it correctly cannot handle eth_getLogs block range
-            # throttle down.
-            provider.middlewares.clear()
+            provider.exception_retry_configuration = None
 
             w3 = Web3(provider)
 

docs/gas_price.rst

@@ -116,6 +116,4 @@ Available gas price strategies
         w3 = Web3()
         w3.eth.set_gas_price_strategy(medium_gas_price_strategy)
 
-        w3.middleware_onion.add(middleware.time_based_cache_middleware)
-        w3.middleware_onion.add(middleware.latest_block_based_cache_middleware)
-        w3.middleware_onion.add(middleware.simple_cache_middleware)
+        w3.provider.cache_allowed_requests = True