Merge tag 'v1.101315.0' into release/optimism-1.x-fh3.0

v1.101315.0 - merge upstream v1.13.15

# -----BEGIN PGP SIGNATURE-----
#
# iQJKBAABCAA0FiEESR/xyrWCv4KQ7fXT7In9uytMdiMFAmY6f5sWHHByb3RvQHBy
# b3RvbGFtYmRhLmNvbQAKCRDsif27K0x2I0gGEACRluT/X79uKb0MlHALm11OgaKV
# rdalZXgP0k11LWTnt1jJoN2NqaFsOv5zHs+O6ClGygpjm10paxA7TFgsQflefUXY
# ggB43G26wc1PK+kM9RWdHehpa0lOWn8q8F7UCAWvLLWvJJIOGZh4jCQePVohh0TC
# 3zbalVppDuqohPzCKUJDW0/Gd5Z5NItoSTsC9Vm6gbjv3csp70u/ciamhKmokoAW
# qsOSvGKNtb/b+GkrstG9j1QSrMFDxKWBonBqJtVEeg1KHE1ElPHqt2PCKwnWx8X2
# 3AHwtxE2SKfsJVvSONfZFUB604rm8QkWHZjyfvSune/SgbWq6B2GjQJ3az9YfeF1
# 4HiyIETfGn0zHXfioSE5IRqob663Oe6d82nXTJfD/5A7Gxpa7fM2pR6/U40BhODC
# xOI5zi5f666CGEzsg1HVhtjj/oHEArkvLKM4e3zYAPGNelv9LS/plmDTnpuxlOdA
# 8teqXUG97XPIRYod3GjtkDLhhEMYgT9zy8pfhyfDr6RiXQ+a0krjOdIjsZ7lEer7
# C9OFAb0RqLKN8ImSOh+2hHhl9SmPlykLhu2ryphcTOErNsk6BlikQIzD8zJBaGqR
# rn8p9U6ozvVnLOA1JKIZfO05K/dbN1TDLp75KqlFGDcckafFw51ZY02+ubeIxNqr
# +xeUsAIUrU3o9apgFw==
# =E5sy
# -----END PGP SIGNATURE-----

# Conflicts:
#	core/chain_makers.go
#	core/genesis.go
#	core/state/state_object.go
#	core/txpool/blobpool/blobpool_test.go
#	core/vm/evm.go
#	core/vm/interpreter.go
#	eth/tracers/api.go
#	eth/tracers/internal/tracetest/calltrace_test.go
#	eth/tracers/internal/tracetest/flat_calltrace_test.go
#	eth/tracers/internal/tracetest/prestate_test.go
#	eth/tracers/native/call.go
#	eth/tracers/tracers_test.go
#	tests/state_test_util.go

.golangci.yml

@@ -1,13 +1,12 @@
 # This file configures github.com/golangci/golangci-lint.
+# see <https://golangci-lint.run/usage/configuration>
 
 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
@@ -40,6 +39,9 @@ linters-settings:
     simplify: true
 
 issues:
+  exclude-dirs-use-default: true
+  exclude-dirs:
+    - core/genesis_alloc.go
   exclude-rules:
     - path: crypto/bn256/cloudflare/optate.go
       linters:

Makefile

@@ -8,27 +8,33 @@ GOBIN = ./build/bin
 GO ?= latest
 GORUN = go run
 
+#? geth: Build geth
 geth:
 	$(GORUN) build/ci.go install ./cmd/geth
 	@echo "Done building."
 	@echo "Run \"$(GOBIN)/geth\" to launch geth."
 
+#? all: Build all packages and executables
 all:
 	$(GORUN) build/ci.go install
 
+#? test: Run the tests
 test: all
 	$(GORUN) build/ci.go test
 
+#? lint: Run certain pre-selected linters
 lint: ## Run linters.
 	$(GORUN) build/ci.go lint
 
+#? clean: Clean go cache, built executables, and the auto generated folder
 clean:
 	go clean -cache
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
 
 # The devtools target installs tools required for 'go generate'.
 # You need to put $GOBIN (or $GOPATH/bin) in your PATH to use 'go generate'.
 
+#? devtools: Install recommended developer tools
 devtools:
 	env GOBIN= go install golang.org/x/tools/cmd/stringer@latest
 	env GOBIN= go install github.com/fjl/gencodec@latest
@@ -42,3 +48,9 @@ forkdiff:
 		--mount src=$(shell pwd),target=/host-pwd,type=bind \
 		protolambda/forkdiff:latest \
 		-repo /host-pwd/ -fork /host-pwd/fork.yaml -out /host-pwd/forkdiff.html
+
+#? help: Get more info on make commands.
+help: Makefile
+	@echo " Choose a command run in go-ethereum:"
+	@sed -n 's/^#?//p' $< | column -t -s ':' |  sort | sed -e 's/^/ /'
+.PHONY: help

README.md

@@ -6,7 +6,7 @@ Golang execution layer implementation of the Ethereum protocol.
 https://pkg.go.dev/badge/github.com/ethereum/go-ethereum
 )](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc)
 [![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum)
-[![Travis](https://travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.com/ethereum/go-ethereum)
+[![Travis](https://app.travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://app.travis-ci.com/github/ethereum/go-ethereum)
 [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv)
 
 Automated builds are available for stable releases and the unstable master branch. Binary

accounts/abi/abi.go

@@ -29,7 +29,7 @@ import (
 )
 
 // The ABI holds information about a contract's context and available
-// invokable methods. It will allow you to type check function calls and
+// invocable methods. It will allow you to type check function calls and
 // packs data accordingly.
 type ABI struct {
 	Constructor Method

accounts/abi/bind/backends/simulated.go

@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	"github.com/ethereum/go-ethereum/ethclient/simulated"
 )
@@ -44,7 +44,7 @@ func (b *SimulatedBackend) Fork(ctx context.Context, parentHash common.Hash) err
 //
 // Deprecated: please use simulated.Backend from package
 // github.com/ethereum/go-ethereum/ethclient/simulated instead.
-func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
+func NewSimulatedBackend(alloc types.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
 	b := simulated.NewBackend(alloc, simulated.WithBlockGasLimit(gasLimit))
 	return &SimulatedBackend{
 		Backend: b,