Upgrade geth to 1.16.7 (#3787)

* Upgrade geth to 1.16.7

* Bump py-geth requirement

* Use later go version

* Update download location for go binary

* Add newsfragment for #3787

Author: kclowes

.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.16.5"
+    default: "1.16.7"
     type: string
   go_version:
-    default: "1.24.1"
+    default: "1.25.5"
     type: string
 
 common: &common
@@ -68,7 +68,7 @@ geth_steps: &geth_steps
             echo "configured geth version: v<< pipeline.parameters.geth_version >>"
             if [ ! -e "$GETH_BINARY" ]; then
               echo "GETH_BINARY not set, installing geth..."
-              curl -O https://storage.googleapis.com/golang/go<< pipeline.parameters.go_version >>.linux-amd64.tar.gz
+              curl -O https://dl.google.com/go/go<< pipeline.parameters.go_version >>.linux-amd64.tar.gz
               tar xvf go<< pipeline.parameters.go_version >>.linux-amd64.tar.gz
               sudo chown -R root:root ./go
               sudo mv go /usr/local
@@ -85,7 +85,7 @@ geth_steps: &geth_steps
             export GOROOT=/usr/local/go
             export GETH_BINARY="./custom_geth"
             echo 'export GETH_BINARY="./custom_geth"' >> $BASH_ENV
-            curl -O https://storage.googleapis.com/golang/go<< pipeline.parameters.go_version >>.linux-amd64.tar.gz
+            curl -O https://dl.google.com/go/go<< pipeline.parameters.go_version >>.linux-amd64.tar.gz
             tar xvf go<< pipeline.parameters.go_version >>.linux-amd64.tar.gz
             sudo chown -R root:root ./go
             sudo mv go /usr/local

docs/contributing.rst

@@ -376,13 +376,13 @@ Geth Fixtures
 
    .. code:: sh
 
-      $ python -m geth.install v1.16.5
+      $ python -m geth.install v1.16.7
 
 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.16.5/bin/geth python ./tests/integration/generate_fixtures/go_ethereum.py
+      $ GETH_BINARY=~/.py-geth/geth-v1.16.7/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/3787.feature.rst

@@ -0,0 +1 @@
+Upgrade geth version in CI

setup.py

@@ -9,7 +9,7 @@
         # 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",

tests/integration/geth-1.16.5-fixture.zip

@@ -35,7 +35,7 @@
 )
 
 KEYFILE_PW = "web3py-test"
-GETH_FIXTURE_ZIP = "geth-1.16.5-fixture.zip"
+GETH_FIXTURE_ZIP = "geth-1.16.7-fixture.zip"
 
 
 @pytest.fixture

tests/integration/geth-1.16.7-fixture.zip

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