all: update to go version 1.23.0 (#30323)

This PR updates the version of go used in builds and docker to 1.23.0. Release notes: https://go.dev/doc/go1.23 More importantly, following our policy of maintaining the last two versions (which now becomes 1.23 and 1.22), we can now make use of the things that were introduced in 1.22: https://go.dev/doc/go1.22 Go 1.22 makes two changes to “for” loops. - each iteration creates new variables, - for loops may range over integers Other than that, some interesting library changes and other stuff.
2024-08-20 15:50:07 +02:00 · 2024-08-20 15:50:07 +02:00 · d0fd1331f1
parent 693e40a495
commit d0fd1331f1
8 changed files with 65 additions and 64 deletions
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@ -15,7 +15,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: 1.21.4
+          go-version: 1.23.0
          cache: false
      - name: Run tests
        run: go test -short ./...
--- a/.travis.yml
+++ b/.travis.yml
@ -16,7 +16,7 @@ jobs:
      os: linux
      arch: amd64
      dist: noble
-      go: 1.22.x
+      go: 1.23.x
      env:
        - docker
      services:
@ -33,7 +33,7 @@ jobs:
      os: linux
      arch: arm64
      dist: noble
-      go: 1.22.x
+      go: 1.23.x
      env:
        - docker
      services:
@ -51,7 +51,7 @@ jobs:
      os: linux
      dist: noble
      sudo: required
-      go: 1.22.x
+      go: 1.23.x
      env:
        - azure-linux
      git:
@ -84,7 +84,7 @@ jobs:
      if: type = push
      os: osx
      osx_image: xcode14.2
-      go: 1.22.x
+      go: 1.23.x
      env:
        - azure-osx
      git:
@ -101,7 +101,7 @@ jobs:
      os: linux
      arch: amd64
      dist: noble
-      go: 1.22.x
+      go: 1.23.x
      script:
        - travis_wait 45 go run build/ci.go test $TEST_PACKAGES

@ -109,7 +109,7 @@ jobs:
      if: type = push
      os: linux
      dist: noble
-      go: 1.21.x
+      go: 1.22.x
      script:
        - travis_wait 45 go run build/ci.go test $TEST_PACKAGES

@ -118,7 +118,7 @@ jobs:
      if: type = cron || (type = push && tag ~= /^v[0-9]/)
      os: linux
      dist: noble
-      go: 1.22.x
+      go: 1.23.x
      env:
        - ubuntu-ppa
      git:
@ -134,7 +134,7 @@ jobs:
      if: type = cron
      os: linux
      dist: noble
-      go: 1.22.x
+      go: 1.23.x
      env:
        - azure-purge
      git:
@ -147,7 +147,7 @@ jobs:
      if: type = cron
      os: linux
      dist: noble
-      go: 1.22.x
+      go: 1.23.x
      env:
        - racetests
      script:
--- a/2
+++ b/2
@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""

 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder

 RUN apk add --no-cache gcc musl-dev linux-headers git

--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""

 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder

 RUN apk add --no-cache gcc musl-dev linux-headers git

--- a/README.md
+++ b/README.md
@ -16,7 +16,7 @@ archives are published at https://geth.ethereum.org/downloads/.

 For prerequisites and detailed build instructions please read the [Installation Instructions](https://geth.ethereum.org/docs/getting-started/installing-geth).

-Building `geth` requires both a Go (version 1.21 or later) and a C compiler. You can install
+Building `geth` requires both a Go (version 1.22 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run

 ```shell
--- a/build/checksums.txt
+++ b/build/checksums.txt
@ -5,55 +5,55 @@
 # https://github.com/ethereum/execution-spec-tests/releases/download/v2.1.0/
 ca89c76851b0900bfcc3cbb9a26cbece1f3d7c64a3bed38723e914713290df6c  fixtures_develop.tar.gz

-# version:golang 1.22.6
+# version:golang 1.23.0
 # https://go.dev/dl/
-9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51  go1.22.6.src.tar.gz
-eeb0cc42120cbae6d3695dae2e5420fa0e93a5db957db139b55efdb879dd9856  go1.22.6.aix-ppc64.tar.gz
-b47ac340f0b072943fed1f558a26eb260cc23bd21b8af175582e9103141d465b  go1.22.6.darwin-amd64.pkg
-9c3c0124b01b5365f73a1489649f78f971ecf84844ad9ca58fde133096ddb61b  go1.22.6.darwin-amd64.tar.gz
-14d0355ec1c0eeb213a16efa8635fac1f16067ef78a8173abf9a8c7b805e551e  go1.22.6.darwin-arm64.pkg
-ebac39fd44fc22feed1bb519af431c84c55776e39b30f4fd62930da9c0cfd1e3  go1.22.6.darwin-arm64.tar.gz
-3695b10c722a4920c8a736284f8820c142e1e752f3a87f797a45c64366f7a173  go1.22.6.dragonfly-amd64.tar.gz
-a9b9570c80294a664d50b566d6bd1aa42465997d2d76a57936b32f55f5c69c63  go1.22.6.freebsd-386.tar.gz
-424a5618406800365fe3ad96a795fb55ce394bea3ff48eaf56d292bf7a916d1e  go1.22.6.freebsd-amd64.tar.gz
-e0dce3a6dbe8e7e054d329dd4cb403935c63c0f7e22e693077aa60e12018b883  go1.22.6.freebsd-arm.tar.gz
-34930b01f58889c71f7a78c51c6c3bd2ce289ac7862c76dab691303cfa935fd1  go1.22.6.freebsd-arm64.tar.gz
-4c9d630e55d4d600a5b4297e59620c3bdfe63a441981682b3638e2fdda228a44  go1.22.6.freebsd-riscv64.tar.gz
-9ed63feaf2ef56c56f1cf0d9d3fab4006efd22a38e2f1f5252e95c6ac09332f3  go1.22.6.illumos-amd64.tar.gz
-9e680027b058beab10ce5938607660964b6d2c564bf50bdb01aa090dc5beda98  go1.22.6.linux-386.tar.gz
-999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616  go1.22.6.linux-amd64.tar.gz
-c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2  go1.22.6.linux-arm64.tar.gz
-b566484fe89a54c525dd1a4cbfec903c1f6e8f0b7b3dbaf94c79bc9145391083  go1.22.6.linux-armv6l.tar.gz
-1ee6e1896aea856142d2af7045cea118995b39404aa61afd12677d023d47ee69  go1.22.6.linux-loong64.tar.gz
-fdd0e1a3e178f9bc79adf6ff1e3de4554ce581b4c468fd6e113c43fbbbe1eec6  go1.22.6.linux-mips.tar.gz
-d3e5a621fc5a07759e503a971af0b28ded6a7d6f5604ab511f51f930a18dd3e4  go1.22.6.linux-mips64.tar.gz
-01547606c5b5c1b0e5587b3afd65172860d2f4755e523785832905759ecce2d7  go1.22.6.linux-mips64le.tar.gz
-2cd771416ae03c11240cfdb551d66ab9a941077664f3727b966f94386c23b0fa  go1.22.6.linux-mipsle.tar.gz
-6ef61d517777925e6bdb0321ea42d5f60acc20c1314dd902b9d0bfa3a5fd4fca  go1.22.6.linux-ppc64.tar.gz
-9d99fce3f6f72a76630fe91ec0884dfe3db828def4713368424900fa98bb2bd6  go1.22.6.linux-ppc64le.tar.gz
-30be9c9b9cc4f044d4da9a33ee601ab7b3aff4246107d323a79e08888710754e  go1.22.6.linux-riscv64.tar.gz
-82f3bae3ddb4ede45b848db48c5486fadb58551e74507bda45484257e7194a95  go1.22.6.linux-s390x.tar.gz
-85b2eb9d40a930bd3e75d0096a6eb5847aac86c5085e6d13a5845e9ef03f8d4b  go1.22.6.netbsd-386.tar.gz
-6e9acbdc34fb2a942d547c47c9c1989bb6e32b4a37d57fb312499e2bb33b46b7  go1.22.6.netbsd-amd64.tar.gz
-e6eff3cf0038f2a9b0c9e01e228577a783bddcd8051222a3d949e24ee392e769  go1.22.6.netbsd-arm.tar.gz
-43a7e2ba22da700b844f7561e3dd5434540ed6c9781be2e9c42e8a8cbf558f8e  go1.22.6.netbsd-arm64.tar.gz
-a90b758ccb45d8a17af8e140fafa1e97607de5a7ecd53a4c55f69258bfb043d0  go1.22.6.openbsd-386.tar.gz
-cc13436c4a644e55bedcea65981eb80ca8317b39b129f5563ab3b6da1391bd47  go1.22.6.openbsd-amd64.tar.gz
-aee34f61ba2b0a8f2618f5c7065e20da7714ce7651680509eda30728fe01ee88  go1.22.6.openbsd-arm.tar.gz
-c67d57daf8baada93c69c8fb02401270cd33159730b1f2d70d9e724ba1a918cf  go1.22.6.openbsd-arm64.tar.gz
-03e1f96002e94a6b381bcf66a0a62b9d5f63148682a780d727840ad540185c7c  go1.22.6.openbsd-ppc64.tar.gz
-0ac2b5bbe2c8a293d284512630e629bf0578aaa7b7b1f39ac4ee182c7924aaad  go1.22.6.plan9-386.tar.gz
-f9afdab8a72a8d874f023f5605482cc94160843ac768dbd840e6f772d16578c7  go1.22.6.plan9-amd64.tar.gz
-4b9f01a47e6a29d57cbb3097b6770583336cef9c8f0d51d3d1451e42a851002e  go1.22.6.plan9-arm.tar.gz
-46c2552ac7b8d6314a52e14e0a0761aaeebdd6aba5f531de386f4cf2b66ec723  go1.22.6.solaris-amd64.tar.gz
-a57821dab76af1ef7a6b62db1628f0caa74343e0c7cb829df9ce8ea0713a3e8e  go1.22.6.windows-386.msi
-eb734bacc9aabca1273b61dd392bb84a9bb33783f5e2fff2cd6ab9885bbefbe6  go1.22.6.windows-386.zip
-1238a3e6892eb8a0eb3fe0640e18ab82ca21cc1a933f16897b2ad081f057b5da  go1.22.6.windows-amd64.msi
-6023083a6e4d3199b44c37e9ba7b25d9674da20fd846a35ee5f9589d81c21a6a  go1.22.6.windows-amd64.zip
-6791218c568a3d000cb36317506541d7fd67e7cfe613baaf361ca36cad5e2cd5  go1.22.6.windows-arm.msi
-ee41ca83bb07c4fd46a1d6b2d083519bb8ca156fcd9db37ee711234d43126e2f  go1.22.6.windows-arm.zip
-91c6b3376612095315a0aeae4b03e3da34fabe9dfd4532d023e2a70f913cf22a  go1.22.6.windows-arm64.msi
-7cf55f357ba8116cd3bff992980e20a704ba451b3dab341cf1787b133d900512  go1.22.6.windows-arm64.zip
+42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6  go1.23.0.src.tar.gz
+257f8560bb4001fb81a5e0ee84f32fecbe18d4450343c9556557d296786847b6  go1.23.0.aix-ppc64.tar.gz
+bc91d2573939a01731413fac0884c329606c1c168883692131ce772669caf27b  go1.23.0.darwin-amd64.pkg
+ffd070acf59f054e8691b838f274d540572db0bd09654af851e4e76ab88403dc  go1.23.0.darwin-amd64.tar.gz
+d73ae741ed449ea842238f76f4b02935277eb867689f84ace0640965b2caf700  go1.23.0.darwin-arm64.pkg
+b770812aef17d7b2ea406588e2b97689e9557aac7e646fe76218b216e2c51406  go1.23.0.darwin-arm64.tar.gz
+8fd2ab5ac8629fc97d25a056693e23f332446603dd3c2b764ccb496872004b0c  go1.23.0.dragonfly-amd64.tar.gz
+2c9b76ead3c44f5b3e40e10b980075addb837f2dd05dafe7c0e4c611fd239753  go1.23.0.freebsd-386.tar.gz
+2c2252902b87ba605fdc0b12b4c860fe6553c0c5483c12cc471756ebdd8249fe  go1.23.0.freebsd-amd64.tar.gz
+8ec48b8d99a515644ae00e79d093ad3b7645dcaf2a19c0a9c0d97916187f4514  go1.23.0.freebsd-arm.tar.gz
+f476bbe8efb0db18155671840545370bfb73903fec04ea897d510569dab16d9c  go1.23.0.freebsd-arm64.tar.gz
+b0e254b2ea5752b4f1c69934ae43a44bbabf98e0c2843af44e1b6d12390eb551  go1.23.0.freebsd-riscv64.tar.gz
+09716dcc7a2e19891b3d1e2ea68a1aab22838fc664cdc5f82d5f8eef05db78cf  go1.23.0.illumos-amd64.tar.gz
+0e8a7340c2632e6fb5088d60f95b52be1f8303143e04cd34e9b2314fafc24edd  go1.23.0.linux-386.tar.gz
+905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3  go1.23.0.linux-amd64.tar.gz
+62788056693009bcf7020eedc778cdd1781941c6145eab7688bd087bce0f8659  go1.23.0.linux-arm64.tar.gz
+0efa1338e644d7f74064fa7f1016b5da7872b2df0070ea3b56e4fef63192e35b  go1.23.0.linux-armv6l.tar.gz
+dc8f723ce1a236e85c8b56d1e6749e270314e99dd41b80a58355e7ffcf9ea857  go1.23.0.linux-loong64.tar.gz
+3332cc76c73c05b3413cdecccffc29aaa3469f87db8ed9f9b784ebb527ca5352  go1.23.0.linux-mips.tar.gz
+0ed5cee92433d09fd0816ec5adfbf4b16d712944e833f6342bbe2df18f7826ae  go1.23.0.linux-mips64.tar.gz
+06a579dd6d1f9a84bc43cab063e7c759a92a6d4dd01fec3d860f22a32df93406  go1.23.0.linux-mips64le.tar.gz
+d522770d32d6ee963f61331a695c4f8a730f2445b965d8d56db0a2e75c62af57  go1.23.0.linux-mipsle.tar.gz
+8c884cb4f2593d897f58ec1b0f23f303acf5c78fd101e76cb48d6cb1fe5e90e7  go1.23.0.linux-ppc64.tar.gz
+8b26e20d4d43a4d7641cddbdc0298d7ba3804d910a9e06cda7672970dbf2829d  go1.23.0.linux-ppc64le.tar.gz
+87726205f1a283247f877ccae8ce147ff4e77ac802382647ac52256eb5642c7  go1.23.0.linux-riscv64.tar.gz
+003722971de02d97131a4dca2496abdab5cb175a6ee0ed9c8227c5ae9b883e69  go1.23.0.linux-s390x.tar.gz
+b203fa2354874c66c40d828e96a6cce1f4e4db192414050a600d0a09b16cafd3  go1.23.0.netbsd-386.tar.gz
+1502c82c3ba663959df99c2cc3ca5e7a5e1a75a1495fd26bef697d63bf1f291c  go1.23.0.netbsd-amd64.tar.gz
+dd50c05c7f613522c8d3d74f598bfc1862c0fee9182b738225820c9b458c7be5  go1.23.0.netbsd-arm.tar.gz
+728a94a648f9502cd6175adaac2b770acde6b26f5f92dcbd8c5a1a43cc44bb10  go1.23.0.netbsd-arm64.tar.gz
+e1ff3584778257778a4e3f0093b09044072423aebedf2015a550537853c46745  go1.23.0.openbsd-386.tar.gz
+d2e30cdb0de256360b51a43f5e551587a7369d8c248120010d5e9432f698a6e8  go1.23.0.openbsd-amd64.tar.gz
+bd5224c8a5f195f4128c866c0d418f1b61db865a1042913fd07714ed85da28db  go1.23.0.openbsd-arm.tar.gz
+fc0e0af3a1b4b7168455e8492a5bb6aa96ceaf46321cef1fc04187301c058890  go1.23.0.openbsd-arm64.tar.gz
+ce7ea9343c7c2ef2700b55b80c45549ce39d164031e4d7bb98bec7ca593ed93d  go1.23.0.openbsd-ppc64.tar.gz
+93b970a8a41f6c89113daaea12e39f2580038af155e823550d0a94a5502c5e2c  go1.23.0.plan9-386.tar.gz
+6231862acbb6c1e02b1455b35446b9789b0b4b3230d249953e6957c393a53011  go1.23.0.plan9-amd64.tar.gz
+632bdd3a1f84b2fe691203423dd2c3f536d4ab250bb52a48e9b05ebf327ae594  go1.23.0.plan9-arm.tar.gz
+16773f85003d9e610960f9af67e00bc6c02359d7914de7224079538cc9c1e93d  go1.23.0.solaris-amd64.tar.gz
+803ef1d4f431d37ac8572ad9b0b65a4f945798208cd16b7f0588960e6b0949ba  go1.23.0.windows-386.msi
+09448fedec0cdf98ad12397222e0c8bfc835b1d0894c0015ced653534b8d7427  go1.23.0.windows-386.zip
+93e1cf580893303d0f6ac10647335de9f0768199d7027d8a361639cae6ab3145  go1.23.0.windows-amd64.msi
+d4be481ef73079ee0ad46081d278923aa3fd78db1b3cf147172592f73e14c1ac  go1.23.0.windows-amd64.zip
+2a361c94879258309343e88c5de5df17f6425df4d74bdf7e333b7298b29f6f29  go1.23.0.windows-arm.msi
+006d93712246a672bdb57906dd5bffcab62facc36169e51a27d52340cdac661f  go1.23.0.windows-arm.zip
+a876ed2bb130d9146152aaf391638abd79dcb3a4f2e9cc59b78709dcef29ced3  go1.23.0.windows-arm64.msi
+0be62073ef8f5a2d3b9adcefddf18c417dab0a7975c71488ac2694856e2ff976  go1.23.0.windows-arm64.zip

 # version:golangci 1.59.0
 # https://github.com/golangci/golangci-lint/releases/
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,8 @@
 module github.com/ethereum/go-ethereum

-go 1.21
+go 1.22
+
+toolchain go1.22.0

 require (
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
--- a/internal/build/download.go
+++ b/internal/build/download.go
@ -57,7 +57,7 @@ func (db *ChecksumDB) Verify(path string) error {
 	}
 	fileHash := hex.EncodeToString(h.Sum(nil))
 	if !db.findHash(filepath.Base(path), fileHash) {
-		return fmt.Errorf("invalid file hash %s for %s", fileHash, filepath.Base(path))
+		return fmt.Errorf("invalid file hash: %s %s", fileHash, filepath.Base(path))
 	}
 	return nil
 }
@ -103,7 +103,6 @@ func (db *ChecksumDB) DownloadFile(url, dstPath string) error {
 	if err != nil {
 		return err
 	}
-
 	return db.Verify(dstPath)
 }