Geth Merge v1.12.2

.gitmodules

@@ -6,6 +6,3 @@
 	path = tests/evm-benchmarks
 	url = https://github.com/ipsilon/evm-benchmarks
 	shallow = true
-[submodule "tests/testdata"]
-	path = tests/testdata
-	url = https://github.com/ethereum/tests.git

.golangci.yml

@@ -1,188 +1,67 @@
 # This file configures github.com/golangci/golangci-lint.
 
 run:
-  go: '1.20'
   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
-    - gen_.*.go
-    - .*_gen.go
 
 linters:
+  disable-all: true
   enable:
     - goconst
     - goimports
+    - gosimple
+    - govet
+    - ineffassign
     - misspell
     - unconvert
-    - bodyclose
-    - containedctx
-    - contextcheck
-    - decorder
+    - typecheck
+    - unused
+    - staticcheck
+    - bidichk
     - durationcheck
-    - errchkjson
-    - errname
-    - exhaustive
     - exportloopref
-    - gocognit
-    - gofmt
-    # - gomnd
-    # - gomoddirectives
-    - gosec
-    - makezero
-    - nestif
-    - nilerr
-    - nilnil
-    - noctx
-    #- nosprintfhostport # TODO: do we use IPv6?
-    - paralleltest
-    - prealloc
-    - predeclared
-    #- promlinter
-    #- revive
-    # - tagliatelle
-    - tenv
-    - thelper
-    - tparallel
-    - unconvert
-    - unparam
-    - wsl
-    - asasalint
-    #- errorlint causes stack overflow. TODO: recheck after each golangci update
+    - whitespace
+
+    # - structcheck # lots of false positives
+    # - errcheck #lot of false positives
+    # - contextcheck
+    # - errchkjson # lots of false positives
+    # - errorlint # this check crashes
+    # - exhaustive # silly check
+    # - makezero # false positives
+    # - nilerr # several intentional
 
 linters-settings:
   gofmt:
     simplify: true
-    auto-fix: false
-
   goconst:
     min-len: 3 # minimum length of string constant
-    min-occurrences: 2 # minimum number of occurrences
-    numbers: true
-
-  goimports:
-    local-prefixes: github.com/ethereum/go-ethereum
-
-  nestif:
-    min-complexity: 5
-
-  prealloc:
-    for-loops: true
-
-  gocritic:
-    # Which checks should be enabled; can't be combined with 'disabled-checks';
-    # See https://go-critic.github.io/overview#checks-overview
-    # To check which checks are enabled run `GL_DEBUG=gocritic ./build/bin/golangci-lint run`
-    # By default list of stable checks is used.
-    enabled-checks:
-      - badLock
-      - filepathJoin
-      - sortSlice
-      - sprintfQuotedString
-      - syncMapLoadAndDelete
-      - weakCond
-      - boolExprSimplify
-      - httpNoBody
-      - ioutilDeprecated
-      - nestingReduce
-      - preferFilepathJoin
-      - redundantSprint
-      - stringConcatSimplify
-      - timeExprSimplify
-      - typeAssertChain
-      - yodaStyleExpr
-      - truncateCmp
-      - equalFold
-      - preferDecodeRune
-      - preferFprint
-      - preferStringWriter
-      - preferWriteByte
-      - sliceClear
-      #- ruleguard
-
-    # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
-    disabled-checks:
-      - regexpMust
-      - exitAfterDefer
-      - dupBranchBody
-      - singleCaseSwitch
-      - unlambda
-      - captLocal
-      - commentFormatting
-      - ifElseChain
-      - importShadow
-      - builtinShadow
-
-    # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
-    # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
-    enabled-tags:
-      - performance
-      - diagnostic
-      - opinionated
-      - style
-    disabled-tags:
-      - experimental
-  govet:
-    disable:
-      - deepequalerrors
-      - fieldalignment
-      - shadow
-      - unsafeptr
-    check-shadowing: true
-    enable-all: true
-    settings:
-      printf:
-        # Run `go tool vet help printf` to see available settings for `printf` analyzer.
-        funcs:
-          - (github.com/ethereum/go-ethereum/log.Logger).Trace
-          - (github.com/ethereum/go-ethereum/log.Logger).Debug
-          - (github.com/ethereum/go-ethereum/log.Logger).Info
-          - (github.com/ethereum/go-ethereum/log.Logger).Warn
-          - (github.com/ethereum/go-ethereum/log.Logger).Error
-          - (github.com/ethereum/go-ethereum/log.Logger).Crit
+    min-occurrences: 6 # minimum number of occurrences
 
 issues:
   exclude-rules:
     - path: crypto/bn256/cloudflare/optate.go
       linters:
         - deadcode
-    - path: crypto/bn256/cloudflare
-      linters:
-        - deadcode
-    - path: p2p/discv5/
-      linters:
-        - deadcode
-    - path: core/vm/instructions_test.go
-      linters:
-        - goconst
-    - path: cmd/faucet/
-      linters:
-        - deadcode
-    # Exclude some linters from running on tests files.
-    - path: test\.go
-      linters:
-        - gosec
-        - unused
-        - deadcode
-        - gocritic
-    - path: cmd/devp2p
-      linters:
-        - gosec
-        - unused
-        - deadcode
-        - gocritic
-    - path: metrics/sample\.go
-      linters:
-        - gosec
-        - gocritic
-    - path: p2p/simulations
-      linters:
-        - gosec
-        - gocritic
-  max-issues-per-linter: 0
-  max-same-issues: 0
-  #new: true
-  new-from-rev: origin/master
+        - staticcheck
+    - path: internal/build/pgp.go
+      text: 'SA1019: "golang.org/x/crypto/openpgp" is deprecated: this package is unmaintained except for security fixes.'
+    - path: core/vm/contracts.go
+      text: 'SA1019: "golang.org/x/crypto/ripemd160" is deprecated: RIPEMD-160 is a legacy hash and should not be used for new applications.'
+    - path: accounts/usbwallet/trezor.go
+      text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
+    - path: accounts/usbwallet/trezor/
+      text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
+  exclude:
+    - 'SA1019: event.TypeMux is deprecated: use Feed'
+    - 'SA1019: strings.Title is deprecated'
+    - 'SA1019: strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead.'
+    - 'SA1029: should not use built-in type string as key for value'
+    - 'SA1019: "io/ioutil" has been deprecated since Go 1.19: As of Go 1.16, the same functionality is now provided by package [io] or package [os], and those implementations should be preferred in new code. See the specific function documentation for details'
+    - 'SA1019: grpc.WithInsecure is deprecated: use WithTransportCredentials and insecure.NewCredentials() instead. Will be supported throughout 1.x'
+    - "SA1019: rand.Read has been deprecated since Go 1.20 because it shouldn't be used: For almost all use cases, crypto/rand.Read is more appropriate"

Makefile

@@ -35,7 +35,7 @@ protoc:
 generate-mocks:
 	go generate mockgen -destination=./tests/bor/mocks/IHeimdallClient.go -package=mocks ./consensus/bor IHeimdallClient
 	go generate mockgen -destination=./eth/filters/IBackend.go -package=filters ./eth/filters Backend
-	go generate mockgen -destination=../eth/filters/IDatabase.go -package=filters . Database
+	go generate mockgen -destination=../eth/filters/IDatabase.go -package=filters ./ethdb Database
 
 geth:
 	$(GORUN) build/ci.go install ./cmd/geth
@@ -58,7 +58,7 @@ ios:
 	@echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
 
 test:
-	$(GOTEST) --timeout 5m -cover -short -coverprofile=cover.out -covermode=atomic $(TESTALL)
+	$(GOTEST) --timeout 15m -cover -short -coverprofile=cover.out -covermode=atomic $(TESTALL)
 
 test-txpool-race:
 	$(GOTEST) -run=TestPoolMiningDataRaces --timeout 600m -race -v ./core/

accounts/abi/abi.go

@@ -245,6 +245,17 @@ func (abi *ABI) EventByID(topic common.Hash) (*Event, error) {
 	return nil, fmt.Errorf("no event with id: %#x", topic.Hex())
 }
 
+// ErrorByID looks up an error by the 4-byte id,
+// returns nil if none found.
+func (abi *ABI) ErrorByID(sigdata [4]byte) (*Error, error) {
+	for _, errABI := range abi.Errors {
+		if bytes.Equal(errABI.ID[:4], sigdata[:]) {
+			return &errABI, nil
+		}
+	}
+	return nil, fmt.Errorf("no error with id: %#x", sigdata[:])
+}
+
 // HasFallback returns an indicator whether a fallback function is included.
 func (abi *ABI) HasFallback() bool {
 	return abi.Fallback.Type == Fallback

accounts/abi/abi_test.go

@@ -1148,6 +1148,34 @@ func TestABI_EventById(t *testing.T) {
 	}
 }
 
+func TestABI_ErrorByID(t *testing.T) {
+	abi, err := JSON(strings.NewReader(`[
+		{"inputs":[{"internalType":"uint256","name":"x","type":"uint256"}],"name":"MyError1","type":"error"},
+		{"inputs":[{"components":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"string","name":"b","type":"string"},{"internalType":"address","name":"c","type":"address"}],"internalType":"struct MyError.MyStruct","name":"x","type":"tuple"},{"internalType":"address","name":"y","type":"address"},{"components":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"string","name":"b","type":"string"},{"internalType":"address","name":"c","type":"address"}],"internalType":"struct MyError.MyStruct","name":"z","type":"tuple"}],"name":"MyError2","type":"error"},
+		{"inputs":[{"internalType":"uint256[]","name":"x","type":"uint256[]"}],"name":"MyError3","type":"error"}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	for name, m := range abi.Errors {
+		a := fmt.Sprintf("%v", &m)
+		var id [4]byte
+		copy(id[:], m.ID[:4])
+		m2, err := abi.ErrorByID(id)
+		if err != nil {
+			t.Fatalf("Failed to look up ABI error: %v", err)
+		}
+		b := fmt.Sprintf("%v", m2)
+		if a != b {
+			t.Errorf("Error %v (id %x) not 'findable' by id in ABI", name, id)
+		}
+	}
+	// test unsuccessful lookups
+	if _, err = abi.ErrorByID([4]byte{}); err == nil {
+		t.Error("Expected error: no error with this id")
+	}
+}
+
 // TestDoubleDuplicateMethodNames checks that if transfer0 already exists, there won't be a name
 // conflict and that the second transfer method will be renamed transfer1.
 func TestDoubleDuplicateMethodNames(t *testing.T) {

accounts/abi/bind/backend.go

@@ -29,7 +29,7 @@ import (
 var (
 	// ErrNoCode is returned by call and transact operations for which the requested
 	// recipient contract to operate on does not exist in the state db or does not
-	// have any code associated with it (i.e. suicided).
+	// have any code associated with it (i.e. self-destructed).
 	ErrNoCode = errors.New("no contract code at given address")
 
 	// ErrNoPendingState is raised when attempting to perform a pending state action