Merge branch 'master' into dev

ucwong · web-flow · commit b6610ed568a5 · 2026-05-07T15:33:20.000+01:00
diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
@@ -331,7 +331,6 @@ func TestEventTupleUnpack(t *testing.T) {
 
 	for _, tc := range testCases {
 		assert := assert.New(t)
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			err := unpackTestEventData(tc.dest, tc.data, tc.jsonLog, assert)
 			if tc.error == "" {
diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go
@@ -67,7 +67,7 @@ func (fc *fileCache) scan(keyDir string) (mapset.Set[string], mapset.Set[string]
 			log.Trace("Ignoring file on account scan", "path", path)
 			continue
 		}
-		// Gather the set of all and fresly modified files
+		// Gather the set of all and freshly modified files
 		all.Add(path)
 
 		modified := fi.ModTime()
diff --git a/common/bitutil/compress_fuzz.go b/common/bitutil/compress_fuzz.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package bitutil
 
diff --git a/common/fdlimit/fdlimit_bsd.go b/common/fdlimit/fdlimit_bsd.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build freebsd || dragonfly
-// +build freebsd dragonfly
 
 package fdlimit
 
diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build linux || netbsd || openbsd || solaris
-// +build linux netbsd openbsd solaris
 
 package fdlimit
 
diff --git a/consensus/consensus.go b/consensus/consensus.go
@@ -27,7 +27,7 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/rpc"
 )
 
-// ChainReader defines a small collection of methods needed to access the local
+// ChainHeaderReader defines a small collection of methods needed to access the local
 // blockchain during header and/or uncle verification.
 type ChainHeaderReader interface {
 	// Config retrieves the blockchain's chain configuration.
diff --git a/core/mkalloc.go b/core/mkalloc.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build none
-// +build none
 
 /*
 The mkalloc tool creates the genesis allocation constants in genesis_alloc.go
diff --git a/core/vm/runtime/fuzz.go b/core/vm/runtime/fuzz.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package runtime
 
diff --git a/crypto/blake2b/blake2bAVX2_amd64.go b/crypto/blake2b/blake2bAVX2_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_amd64.go b/crypto/blake2b/blake2b_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.7 && amd64 && !gccgo && !appengine
-// +build !go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_f_fuzz.go b/crypto/blake2b/blake2b_f_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_f_fuzz_test.go b/crypto/blake2b/blake2b_f_fuzz_test.go
@@ -1,6 +1,5 @@
 // Only enable fuzzer on platforms with AVX enabled
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 
diff --git a/crypto/blake2b/blake2b_ref.go b/crypto/blake2b/blake2b_ref.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || appengine || gccgo
-// +build !amd64 appengine gccgo
 
 package blake2b
 
diff --git a/crypto/blake2b/register.go b/crypto/blake2b/register.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package blake2b
 
diff --git a/crypto/bls12381/arithmetic_decl.go b/crypto/bls12381/arithmetic_decl.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build (amd64 && blsasm) || (amd64 && blsadx)
-// +build amd64,blsasm amd64,blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_fallback.go b/crypto/bls12381/arithmetic_fallback.go
diff --git a/crypto/bls12381/arithmetic_x86_adx.go b/crypto/bls12381/arithmetic_x86_adx.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build amd64 && blsadx
-// +build amd64,blsadx
 
 package bls12381
 
diff --git a/crypto/bls12381/arithmetic_x86_noadx.go b/crypto/bls12381/arithmetic_x86_noadx.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build amd64 && blsasm
-// +build amd64,blsasm
 
 package bls12381
 
diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build amd64 || arm64
-// +build amd64 arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build gofuzz
-// +build gofuzz
 
 package bn256
 
diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go
@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build !amd64 && !arm64
-// +build !amd64,!arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256
diff --git a/crypto/bn256/cloudflare/gfp_decl.go b/crypto/bn256/cloudflare/gfp_decl.go
@@ -1,5 +1,4 @@
 //go:build (amd64 && !generic) || (arm64 && !generic)
-// +build amd64,!generic arm64,!generic
 
 package bn256
 
diff --git a/crypto/bn256/cloudflare/gfp_generic.go b/crypto/bn256/cloudflare/gfp_generic.go
@@ -1,5 +1,4 @@
 //go:build (!amd64 && !arm64) || generic
-// +build !amd64,!arm64 generic
 
 package bn256
 
diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go
@@ -1,5 +1,4 @@
 //go:build dummy
-// +build dummy
 
 // This file is part of a workaround for `go mod vendor` which won't vendor
 // C files if there's no Go file in the same directory.
diff --git a/crypto/secp256k1/scalar_mult_nocgo.go b/crypto/secp256k1/scalar_mult_nocgo.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build gofuzz || !cgo
-// +build gofuzz !cgo
 
 package secp256k1
 
diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go
@@ -3,7 +3,6 @@
 // the LICENSE file.
 
 //go:build !gofuzz && cgo
-// +build !gofuzz,cgo
 
 package secp256k1
 
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !nacl && !js && !wasip1 && cgo && !gofuzz && !tinygo
-// +build !nacl,!js,!wasip1,cgo,!gofuzz,!tinygo
 
 package crypto
 
diff --git a/crypto/signature_nocgo.go b/crypto/signature_nocgo.go
@@ -15,7 +15,6 @@
 // along with the CortexFoundation library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build nacl || js || wasip1 || !cgo || gofuzz || tinygo
-// +build nacl js wasip1 !cgo gofuzz tinygo
 
 package crypto
 
diff --git a/crypto/signify/signify_fuzz.go b/crypto/signify/signify_fuzz.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build gofuzz
-// +build gofuzz
 
 package signify
 
diff --git a/ctxcdb/leveldb/leveldb.go b/ctxcdb/leveldb/leveldb.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !js && !wasip1
-// +build !js,!wasip1
 
 // Package leveldb implements the key-value database layer based on LevelDB.
 package leveldb
diff --git a/event/feedof.go b/event/feedof.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.18
-// +build go1.18
 
 package event
 
diff --git a/event/feedof_test.go b/event/feedof_test.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.18
-// +build go1.18
 
 package event
 
diff --git a/internal/cmdtest/test_cmd.go b/internal/cmdtest/test_cmd.go
@@ -225,8 +225,8 @@ type testlogger struct {
 }
 
 func (tl *testlogger) Write(b []byte) (n int, err error) {
-	lines := bytes.Split(b, []byte("\n"))
-	for _, line := range lines {
+	lines := bytes.SplitSeq(b, []byte("\n"))
+	for line := range lines {
 		if len(line) > 0 {
 			tl.t.Logf("(stderr) %s", line)
 		}
diff --git a/log/handler_glog.go b/log/handler_glog.go
@@ -86,7 +86,7 @@ func (h *GlogHandler) Verbosity(level slog.Level) {
 //	 sets V to 3 in all files of any packages whose import path contains "foo"
 func (h *GlogHandler) Vmodule(ruleset string) error {
 	var filter []pattern
-	for _, rule := range strings.Split(ruleset, ",") {
+	for rule := range strings.SplitSeq(ruleset, ",") {
 		// Empty strings such as from a trailing comma can be ignored
 		if len(rule) == 0 {
 			continue
@@ -113,7 +113,7 @@ func (h *GlogHandler) Vmodule(ruleset string) error {
 		}
 		// Compile the rule pattern into a regular expression
 		matcher := ".*"
-		for _, comp := range strings.Split(parts[0], "/") {
+		for comp := range strings.SplitSeq(parts[0], "/") {
 			if comp == "*" {
 				matcher += "(/.*)?"
 			} else if comp != "" {
diff --git a/metrics/cpu_disabled.go b/metrics/cpu_disabled.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build ios || js || wasip1 || tinygo
-// +build ios js wasip1 tinygo
 
 package metrics
 
diff --git a/metrics/cpu_enabled.go b/metrics/cpu_enabled.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !ios && !js && !wasip1 && !tinygo
-// +build !ios,!js,!wasip1,!tinygo
 
 package metrics
 
diff --git a/metrics/cputime_nop.go b/metrics/cputime_nop.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows || js || tinygo
-// +build windows js tinygo
 
 package metrics
 
diff --git a/metrics/cputime_unix.go b/metrics/cputime_unix.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows && !js && !wasip1 && !tinygo
-// +build !windows,!js,!wasip1,!tinygo
 
 package metrics
 
diff --git a/metrics/disk_nop.go b/metrics/disk_nop.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !linux
-// +build !linux
 
 package metrics
 
diff --git a/metrics/syslog.go b/metrics/syslog.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package metrics
 
diff --git a/node/node_test.go b/node/node_test.go
@@ -163,7 +163,6 @@ func TestServiceLifeCycle(t *testing.T) {
 	stopped := make(map[string]bool)
 
 	for id, maker := range services {
-		id := id // Closure for the constructor
 		constructor := func(*ServiceContext) (Service, error) {
 			return &InstrumentedService{
 				startHook: func() { started[id] = true },
@@ -263,7 +262,6 @@ func TestServiceConstructionAbortion(t *testing.T) {
 	}
 	started := make(map[string]bool)
 	for id, maker := range services {
-		id := id // Closure for the constructor
 		constructor := func(*ServiceContext) (Service, error) {
 			return &InstrumentedService{
 				startHook: func() { started[id] = true },
@@ -314,7 +312,6 @@ func TestServiceStartupAbortion(t *testing.T) {
 	stopped := make(map[string]bool)
 
 	for id, maker := range services {
-		id := id // Closure for the constructor
 		constructor := func(*ServiceContext) (Service, error) {
 			return &InstrumentedService{
 				startHook: func() { started[id] = true },
@@ -369,7 +366,6 @@ func TestServiceTerminationGuarantee(t *testing.T) {
 	stopped := make(map[string]bool)
 
 	for id, maker := range services {
-		id := id // Closure for the constructor
 		constructor := func(*ServiceContext) (Service, error) {
 			return &InstrumentedService{
 				startHook: func() { started[id] = true },
@@ -555,7 +551,6 @@ func TestAPIGather(t *testing.T) {
 	}
 
 	for id, config := range services {
-		config := config
 		constructor := func(*ServiceContext) (Service, error) {
 			return &InstrumentedService{apis: config.APIs}, nil
 		}
diff --git a/p2p/dnsdisc/tree.go b/p2p/dnsdisc/tree.go
@@ -366,7 +366,7 @@ func parseBranch(e string) (entry, error) {
 		return &branchEntry{}, nil // empty entry is OK
 	}
 	hashes := make([]string, 0, strings.Count(e, ","))
-	for _, c := range strings.Split(e, ",") {
+	for c := range strings.SplitSeq(e, ",") {
 		if !isValidHash(c) {
 			return nil, entryError{"branch", errInvalidChild}
 		}
diff --git a/p2p/netutil/toobig_notwindows.go b/p2p/netutil/toobig_notwindows.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows
-// +build !windows
 
 package netutil
 
diff --git a/p2p/netutil/toobig_windows.go b/p2p/netutil/toobig_windows.go
@@ -15,7 +15,6 @@
 // along with The go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build windows
-// +build windows
 
 package netutil
 
diff --git a/rlp/internal/rlpstruct/rlpstruct.go b/rlp/internal/rlpstruct/rlpstruct.go
@@ -148,7 +148,7 @@ func parseTag(field Field, lastPublic int) (Tags, error) {
 	name := field.Name
 	tag := reflect.StructTag(field.Tag)
 	var ts Tags
-	for _, t := range strings.Split(tag.Get("rlp"), ",") {
+	for t := range strings.SplitSeq(tag.Get("rlp"), ",") {
 		switch t = strings.TrimSpace(t); t {
 		case "":
 			// empty tag is allowed for some reason
diff --git a/rlp/safe.go b/rlp/safe.go
diff --git a/rlp/unsafe.go b/rlp/unsafe.go
diff --git a/rpc/ipc_js.go b/rpc/ipc_js.go
diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go
diff --git a/rpc/ipc_wasip1.go b/rpc/ipc_wasip1.go
diff --git a/rpc/ipc_windows.go b/rpc/ipc_windows.go
diff --git a/rpc/server_test.go b/rpc/server_test.go
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
diff --git a/trie/trie_test.go b/trie/trie_test.go

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func (fc *fileCache) scan(keyDir string) (mapset.Set[string], mapset.Set[string]`
`67`	`67`	`log.Trace("Ignoring file on account scan", "path", path)`
`68`	`68`	`continue`
`69`	`69`	`}`
`70`		`- // Gather the set of all and fresly modified files`
	`70`	`+ // Gather the set of all and freshly modified files`
`71`	`71`	`all.Add(path)`
`72`	`72`
`73`	`73`	`modified := fi.ModTime()`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/CortexFoundation/CortexTheseus/rpc"`
`28`	`28`	`)`
`29`	`29`
`30`		`-// ChainReader defines a small collection of methods needed to access the local`
	`30`	`+// ChainHeaderReader defines a small collection of methods needed to access the local`
`31`	`31`	`// blockchain during header and/or uncle verification.`
`32`	`32`	`type ChainHeaderReader interface {`
`33`	`33`	`// Config retrieves the blockchain's chain configuration.`