all: Upgrade Go to 1.23.1

YoshihitoAso · YoshihitoAso · commit a7739a504437 · 2024-09-17T11:22:30.000+09:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
       uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version: '1.23'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,7 +6,7 @@ on:
       - '**.md'
       - .gitignore
 env:
-  GO_VERSION: 1.22.1
+  GO_VERSION: 1.23.1
 jobs:
   lint:
     name: 'Code linters'
diff --git a/.golangci.yml b/.golangci.yml
@@ -3,11 +3,6 @@
 run:
   timeout: 20m
   tests: true
-  # default is true. Enables skipping of directories:
-  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: true
-  skip-files:
-    - core/genesis_alloc.go
 
 linters:
   disable-all: true
@@ -23,7 +18,6 @@ linters:
     - staticcheck
     - bidichk
     - durationcheck
-    - exportloopref
     - whitespace
 
     # - structcheck # lots of false positives
@@ -43,6 +37,8 @@ linters-settings:
     min-occurrences: 6 # minimum number of occurrences
 
 issues:
+  exclude-files:
+    - core/genesis_alloc.go
   exclude-rules:
     - path: crypto/bn256/cloudflare/optate.go
       linters:
diff --git a/Dockerfile b/Dockerfile
@@ -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
 
diff --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
 
diff --git a/README.md b/README.md
@@ -22,11 +22,11 @@ The version control policy of this project follows that of ibet-Network.
 Currently, the ibet Network is built using a node client based on v24.4.0 of GoQuorum. 
 However, it has been variously patched to be optimized for ibet Network. For example:
 - The default block generation interval is set to 1 second.
-- Fully supports Go 1.22 and applies new 3rd party packages from a security perspective.
+- Fully supports Go 1.23 and applies new 3rd party packages from a security perspective.
 - Made temporary fixes for bugs before they were fixed in the original GoQuorum.
 
 ## Building the source
-Building quorum requires both a Go (version 1.22) and a C compiler. 
+Building quorum requires both a Go (version 1.23) and a C compiler. 
 You can install them using your favourite package manager. 
 Once the dependencies are installed, run
 ```
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
@@ -909,7 +909,7 @@ func TestOOMMaliciousInput(t *testing.T) {
 		}
 		encb, err := hex.DecodeString(test.enc)
 		if err != nil {
-			t.Fatalf("invalid hex: %s" + test.enc)
+			t.Fatalf("invalid hex: %s", test.enc)
 		}
 		_, err = abi.Methods["method"].Outputs.UnpackValues(encb)
 		if err == nil {
diff --git a/build/checksums.txt b/build/checksums.txt
diff --git a/build/ci.go b/build/ci.go
@@ -130,7 +130,7 @@ var (
 	// This is the version of go that will be downloaded by
 	//
 	//     go run ci.go install -dlgo
-	dlgoVersion = "1.22.1"
+	dlgoVersion = "1.23.1"
 )
 
 var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))
@@ -327,7 +327,7 @@ func doLint(cmdline []string) {
 
 // downloadLinter downloads and unpacks golangci-lint.
 func downloadLinter(cachedir string) string {
-	const version = "1.56.2"
+	const version = "1.61.0"
 
 	csdb := build.MustLoadChecksums("build/checksums.txt")
 	arch := runtime.GOARCH
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -379,7 +379,6 @@ func geth(ctx *cli.Context) error {
 // miner.
 func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend) {
 	log.DoEmitCheckpoints = ctx.Bool(utils.EmitCheckpointsFlag.Name)
-	debug.Memsize.Add("node", stack)
 
 	// raft mode does not support --exitwhensynced
 	if ctx.Bool(utils.ExitWhenSyncedFlag.Name) && ctx.Bool(utils.RaftModeFlag.Name) {
diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go
@@ -393,7 +393,7 @@ func TestBlockReceiptStorage(t *testing.T) {
 		t.Fatalf("no receipts returned")
 	} else {
 		if err := checkReceiptsRLP(rs, receipts); err != nil {
-			t.Fatalf(err.Error())
+			t.Fatalf("%s", err.Error())
 		}
 		// check that the raw data does not contain the quorumExtraData array (since the prepared receipts do not have any quorumExtraData)
 		receiptData := ReadReceiptsRLP(db, hash, 0)
@@ -408,7 +408,7 @@ func TestBlockReceiptStorage(t *testing.T) {
 	}
 	// Ensure that receipts without metadata can be returned without the block body too
 	if err := checkReceiptsRLP(ReadRawReceipts(db, hash, 0), receipts); err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 	// Sanity check that body alone without the receipt is a full purge
 	WriteBody(db, hash, 0, body)
@@ -486,7 +486,7 @@ func TestBlockReceiptStorageWithLegacyMPSV1EncodingWithMPSData(t *testing.T) {
 		t.Fatalf("no receipts returned")
 	} else {
 		if err := checkReceiptsRLP(rs, receipts); err != nil {
-			t.Fatalf(err.Error())
+			t.Fatalf("%s", err.Error())
 		}
 		rec2 := rs[1]
 		assert.Len(t, rec2.PSReceipts, 1)
@@ -500,7 +500,7 @@ func TestBlockReceiptStorageWithLegacyMPSV1EncodingWithMPSData(t *testing.T) {
 	}
 	// Ensure that receipts without metadata can be returned without the block body too
 	if err := checkReceiptsRLP(ReadRawReceipts(db, hash, 0), receipts); err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -556,7 +556,7 @@ func TestBlockReceiptStorageWithLegacyMPSV1EncodingWithoutMPSData(t *testing.T)
 		t.Fatalf("no receipts returned")
 	} else {
 		if err := checkReceiptsRLP(rs, receipts); err != nil {
-			t.Fatalf(err.Error())
+			t.Fatalf("%s", err.Error())
 		}
 		rec2 := rs[1]
 		assert.Len(t, rec2.PSReceipts, 0)
@@ -568,7 +568,7 @@ func TestBlockReceiptStorageWithLegacyMPSV1EncodingWithoutMPSData(t *testing.T)
 	}
 	// Ensure that receipts without metadata can be returned without the block body too
 	if err := checkReceiptsRLP(ReadRawReceipts(db, hash, 0), receipts); err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -644,7 +644,7 @@ func TestBlockReceiptStorageWithQuorumExtraData(t *testing.T) {
 		t.Fatalf("no receipts returned")
 	} else {
 		if err := checkReceiptsRLP(rs, receipts); err != nil {
-			t.Fatalf(err.Error())
+			t.Fatalf("%s", err.Error())
 		}
 		rec2 := rs[1]
 		assert.Len(t, rec2.PSReceipts, 1)
@@ -659,7 +659,7 @@ func TestBlockReceiptStorageWithQuorumExtraData(t *testing.T) {
 	}
 	// Ensure that receipts without metadata can be returned without the block body too
 	if err := checkReceiptsRLP(ReadRawReceipts(db, hash, 0), receipts); err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 	// Sanity check that body alone without the receipt is a full purge
 	WriteBody(db, hash, 0, body)
diff --git a/core/types/receipt.go b/core/types/receipt.go
@@ -703,7 +703,7 @@ func (r *QuorumReceiptExtraData) EncodeRLP(w io.Writer) error {
 }
 
 func (r *QuorumReceiptExtraData) IsEmpty() bool {
-	return (r.PSReceipts == nil || len(r.PSReceipts) == 0) && r.RevertReason == nil
+	return len(r.PSReceipts) == 0 && r.RevertReason == nil
 }
 
 // LEGACY STRUCTURES TO COPE WITH MPS RECEIPT RLP ENCODING
diff --git a/crypto/bn256/cloudflare/gfp_decl.go b/crypto/bn256/cloudflare/gfp_decl.go
@@ -9,10 +9,10 @@ import (
 	"golang.org/x/sys/cpu"
 )
 
-// nolint:varcheck,unused,deadcode
+//nolint:varcheck,unused,deadcode
 var hasBMI2 = cpu.X86.HasBMI2
 
-// go:noescape
+//go:noescape
 func gfpNeg(c, a *gfP)
 
 //go:noescape
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ethereum/go-ethereum
 
-go 1.22
+go 1.23.1
 
 // Quorum - Replace Go modules that use modifications done by us
 replace github.com/coreos/etcd => github.com/Consensys/etcd v3.3.13-quorum197+incompatible
@@ -27,7 +27,6 @@ require (
 	github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498
 	github.com/eapache/channels v1.1.0
 	github.com/fatih/color v1.17.0
-	github.com/fjl/memsize v0.0.2
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08
 	github.com/go-stack/stack v1.8.1
diff --git a/go.sum b/go.sum
@@ -193,8 +193,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
 github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
-github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=
-github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
@@ -27,14 +27,11 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/exp"
-	"github.com/fjl/memsize/memsizeui"
 	"github.com/mattn/go-colorable"
 	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
 )
 
-var Memsize memsizeui.Handler
-
 var (
 	verbosityFlag = &cli.IntFlag{
 		Name:  "verbosity",
@@ -255,7 +252,6 @@ func StartPProf(address string, withMetrics bool) {
 	if withMetrics {
 		exp.Exp(metrics.DefaultRegistry)
 	}
-	http.Handle("/memsize/", http.StripPrefix("/memsize", &Memsize))
 	log.Info("Starting pprof server", "addr", fmt.Sprintf("http://%s/debug/pprof", address))
 	go func() {
 		if err := http.ListenAndServe(address, nil); err != nil {
diff --git a/metrics/json_test.go b/metrics/json_test.go
@@ -13,7 +13,7 @@ func TestRegistryMarshallJSON(t *testing.T) {
 	r.Register("counter", NewCounter())
 	enc.Encode(r)
 	if s := b.String(); s != "{\"counter\":{\"count\":0}}\n" {
-		t.Fatalf(s)
+		t.Fatalf("%s", s)
 	}
 }
 
diff --git a/plugin/utils_test.go b/plugin/utils_test.go
@@ -13,11 +13,11 @@ func TestIsValidTargetURL(t *testing.T) {
 	assert.Error(t, isValidTargetURL("https://localhost", "http://localhost.com"))
 
 	if err := isValidTargetURL("http://localhost.com", "http://localhost.com"); err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("%s", err.Error())
 	}
 
 	if err := isValidTargetURL("https://localhost.com/../../", "https://localhost.com"); err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("%s", err.Error())
 	}
 }
 
diff --git a/rlp/decode.go b/rlp/decode.go
@@ -153,13 +153,13 @@ func makeDecoder(typ reflect.Type, tags tags) (dec decoder, err error) {
 	switch {
 	case typ == rawValueType:
 		return decodeRawValue, nil
-	case typ.AssignableTo(reflect.PtrTo(bigInt)):
+	case typ.AssignableTo(reflect.PointerTo(bigInt)):
 		return decodeBigInt, nil
 	case typ.AssignableTo(bigInt):
 		return decodeBigIntNoPtr, nil
 	case kind == reflect.Ptr:
 		return makePtrDecoder(typ, tags)
-	case reflect.PtrTo(typ).Implements(decoderInterface):
+	case reflect.PointerTo(typ).Implements(decoderInterface):
 		return decodeDecoder, nil
 	case isUint(kind):
 		return decodeUint, nil
@@ -239,7 +239,7 @@ func decodeBigInt(s *Stream, val reflect.Value) error {
 
 func makeListDecoder(typ reflect.Type, tag tags) (decoder, error) {
 	etype := typ.Elem()
-	if etype.Kind() == reflect.Uint8 && !reflect.PtrTo(etype).Implements(decoderInterface) {
+	if etype.Kind() == reflect.Uint8 && !reflect.PointerTo(etype).Implements(decoderInterface) {
 		if typ.Kind() == reflect.Array {
 			return decodeByteArray, nil
 		}
@@ -439,7 +439,7 @@ func makeSimplePtrDecoder(etype reflect.Type, etypeinfo *typeinfo) decoder {
 //
 // This decoder is used for pointer-typed struct fields with struct tag "nil".
 func makeNilPtrDecoder(etype reflect.Type, etypeinfo *typeinfo, nilKind Kind) decoder {
-	typ := reflect.PtrTo(etype)
+	typ := reflect.PointerTo(etype)
 	nilPtr := reflect.Zero(typ)
 	return func(s *Stream, val reflect.Value) (err error) {
 		kind, size, err := s.Kind()
diff --git a/rlp/encode.go b/rlp/encode.go
@@ -332,13 +332,13 @@ func makeWriter(typ reflect.Type, ts tags) (writer, error) {
 	switch {
 	case typ == rawValueType:
 		return writeRawValue, nil
-	case typ.AssignableTo(reflect.PtrTo(bigInt)):
+	case typ.AssignableTo(reflect.PointerTo(bigInt)):
 		return writeBigIntPtr, nil
 	case typ.AssignableTo(bigInt):
 		return writeBigIntNoPtr, nil
 	case kind == reflect.Ptr:
 		return makePtrWriter(typ, ts)
-	case reflect.PtrTo(typ).Implements(encoderInterface):
+	case reflect.PointerTo(typ).Implements(encoderInterface):
 		return makeEncoderWriter(typ), nil
 	case isUint(kind):
 		return writeUint, nil

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ func TestOOMMaliciousInput(t *testing.T) {`
`909`	`909`	`}`
`910`	`910`	`encb, err := hex.DecodeString(test.enc)`
`911`	`911`	`if err != nil {`
`912`		`- t.Fatalf("invalid hex: %s" + test.enc)`
	`912`	`+ t.Fatalf("invalid hex: %s", test.enc)`
`913`	`913`	`}`
`914`	`914`	`_, err = abi.Methods["method"].Outputs.UnpackValues(encb)`
`915`	`915`	`if err == nil {`