Update geth fixture to use geth v1.15.5

Author: fselmo

.circleci/config.yml

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

docs/contributing.rst

@@ -365,13 +365,13 @@ Geth Fixtures
 
    .. code:: sh
 
-      $ python -m geth.install v1.14.12
+      $ python -m geth.install v1.15.5
 
 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.14.12/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py
+      $ GETH_BINARY=~/.py-geth/geth-v1.15.5/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

newsfragments/3636.internal.rst

@@ -0,0 +1 @@
+Update integration test fixture to use latest geth version ``v1.15.5``.

tests/integration/generate_fixtures/common.py

@@ -59,6 +59,11 @@
         # post-merge, timestamp is used for network transitions
         "shanghaiTime": 0,
         "cancunTime": 0,
+        "pragueTime": 0,
+        "blobSchedule": {
+            "cancun": {"target": 3, "max": 6, "baseFeeUpdateFraction": 3338477},
+            "prague": {"target": 6, "max": 9, "baseFeeUpdateFraction": 5007716},
+        },
     },
     "nonce": "0x0",
     "alloc": {

tests/integration/geth-1.14.12-fixture.zip

@@ -34,7 +34,7 @@
 )
 
 KEYFILE_PW = "web3py-test"
-GETH_FIXTURE_ZIP = "geth-1.14.12-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.15.5-fixture.zip"
 
 
 @pytest.fixture(scope="module")
@@ -97,12 +97,16 @@ def base_geth_command_arguments(geth_binary, datadir):
         "2",
         "--password",
         os.path.join(datadir, "keystore", "pw.txt"),
+        # in order to raise on underpriced transactions, ``txpool.nolocals`` is now
+        # necessary: https://github.com/ethereum/go-ethereum/pull/31202
+        "--txpool.nolocals",
     )
 
 
 @pytest.fixture(scope="module")
 def geth_zipfile_version(get_geth_version):
-    if get_geth_version.major == 1 and get_geth_version.minor in [13, 14]:
+    # TODO: Remove support for 1.13.x in next major version
+    if get_geth_version.major == 1 and get_geth_version.minor in [13, 14, 15]:
         return GETH_FIXTURE_ZIP
     raise AssertionError("Unsupported geth version")
 

tests/integration/geth-1.15.5-fixture.zip

@@ -48,7 +48,8 @@ def _geth_command_arguments(ws_port, base_geth_command_arguments, geth_version):
             "--ipcdisable",
             "--allow-insecure-unlock",
         )
-        if geth_version.minor not in [13, 14]:
+        if geth_version.minor not in [13, 14, 15]:
+            # TODO: remove support for 1.13.x in next major version
             raise AssertionError("Unsupported Geth version")
     else:
         raise AssertionError("Unsupported Geth version")

tests/integration/go_ethereum/conftest.py

@@ -33,7 +33,8 @@ def _geth_command_arguments(ws_port, base_geth_command_arguments, geth_version):
             "*",
             "--ipcdisable",
         )
-        if geth_version.minor not in [13, 14]:
+        if geth_version.minor not in [13, 14, 15]:
+            # TODO: remove support for 1.13.x in the next major release
             raise AssertionError("Unsupported Geth version")
     else:
         raise AssertionError("Unsupported Geth version")

tests/integration/go_ethereum/test_goethereum_legacy_ws.py

@@ -24,7 +24,7 @@
     kill_proc_gracefully,
 )
 
-GETH_FIXTURE_ZIP = "geth-1.14.12-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.15.5-fixture.zip"
 
 
 class GethBenchmarkFixture: