primev
diff --git a/‎.mailmap
Lines changed: 0 additions & 1 deletion b/‎.mailmap
Lines changed: 0 additions & 1 deletion
diff --git a/‎.travis.yml
Lines changed: 10 additions & 10 deletions b/‎.travis.yml
Lines changed: 10 additions & 10 deletions
diff --git a/‎Dockerfile
Lines changed: 2 additions & 2 deletions b/‎Dockerfile
Lines changed: 2 additions & 2 deletions
diff --git a/‎Dockerfile.alltools
Lines changed: 2 additions & 2 deletions b/‎Dockerfile.alltools
Lines changed: 2 additions & 2 deletions
diff --git a/‎Makefile
Lines changed: 1 addition & 2 deletions b/‎Makefile
Lines changed: 1 addition & 2 deletions
diff --git a/‎README.md
Lines changed: 1 addition & 1 deletion b/‎README.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎accounts/abi/argument.go
Lines changed: 1 addition & 1 deletion b/‎accounts/abi/argument.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎accounts/abi/bind/auth.go
Lines changed: 1 addition & 1 deletion b/‎accounts/abi/bind/auth.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎accounts/abi/bind/backends/simulated.go
Lines changed: 2 additions & 2 deletions b/‎accounts/abi/bind/backends/simulated.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎accounts/abi/bind/base.go
Lines changed: 2 additions & 5 deletions b/‎accounts/abi/bind/base.go
Lines changed: 2 additions & 5 deletions
@@ -56,7 +56,6 @@ Diederik Loerakker <[email protected]>
 Dimitry Khokhlov <[email protected]>
 
 Domino Valdano <[email protected]>
-Domino Valdano <[email protected]> <[email protected]>
 
 Edgar Aroutiounian <[email protected]>
 
 
@@ -16,7 +16,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -33,7 +33,7 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -51,7 +51,7 @@ jobs:
       os: linux
       dist: bionic
       sudo: required
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-linux
       git:
@@ -85,7 +85,7 @@ jobs:
       if: type = push
       os: osx
       osx_image: xcode14.2
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-osx
       git:
@@ -101,7 +101,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -110,14 +110,14 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.20.x
+      go: 1.21.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     - stage: build
       os: linux
       dist: bionic
-      go: 1.20.x
+      go: 1.21.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -126,7 +126,7 @@ jobs:
       if: type = cron || (type = push && tag ~= /^v[0-9]/)
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
       git:
@@ -149,7 +149,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-purge
       git:
@@ -162,7 +162,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test  -race $TEST_PACKAGES
 
@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 
@@ -25,7 +25,7 @@ COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
 EXPOSE 8545 8546 30303 30303/udp
 ENTRYPOINT ["geth"]
 
-# Add some metadata labels to help programatic image consumption
+# Add some metadata labels to help programmatic image consumption
 ARG COMMIT=""
 ARG VERSION=""
 ARG BUILDNUM=""
 
@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 
@@ -24,7 +24,7 @@ COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
 
 EXPOSE 8545 8546 30303 30303/udp
 
-# Add some metadata labels to help programatic image consumption
+# Add some metadata labels to help programmatic image consumption
 ARG COMMIT=""
 ARG VERSION=""
 ARG BUILDNUM=""
 
@@ -2,7 +2,7 @@
 # with Go source code. If you know what GOPATH is then you probably
 # don't need to bother with make.
 
-.PHONY: geth android ios evm all test clean
+.PHONY: geth all test lint clean devtools help
 
 GOBIN = ./build/bin
 GO ?= latest
@@ -47,4 +47,3 @@ devtools:
 help: Makefile
 	@echo " Choose a command run in go-ethereum:"
 	@sed -n 's/^#?//p' $< | column -t -s ':' |  sort | sed -e 's/^/ /'
-.PHONY: help
@@ -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.19 or later) and a C compiler. You can install
+Building `geth` requires both a Go (version 1.21 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell
 
@@ -127,7 +127,7 @@ func (arguments Arguments) Copy(v interface{}, values []interface{}) error {
 	return arguments.copyAtomic(v, values[0])
 }
 
-// unpackAtomic unpacks ( hexdata -> go ) a single value
+// copyAtomic copies ( hexdata -> go ) a single value
 func (arguments Arguments) copyAtomic(v interface{}, marshalledValues interface{}) error {
 	dst := reflect.ValueOf(v).Elem()
 	src := reflect.ValueOf(marshalledValues)
 
@@ -142,10 +142,10 @@ func NewKeyStoreTransactorWithChainID(keystore *keystore.KeyStore, account accou
 // NewKeyedTransactorWithChainID is a utility method to easily create a transaction signer
 // from a single private key.
 func NewKeyedTransactorWithChainID(key *ecdsa.PrivateKey, chainID *big.Int) (*TransactOpts, error) {
-	keyAddr := crypto.PubkeyToAddress(key.PublicKey)
 	if chainID == nil {
 		return nil, ErrNoChainID
 	}
+	keyAddr := crypto.PubkeyToAddress(key.PublicKey)
 	signer := types.LatestSignerForChainID(chainID)
 	return &TransactOpts{
 		From: keyAddr,
 
@@ -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/ethclient/simulated"
 )
 
@@ -43,7 +43,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,
 
@@ -461,7 +461,7 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
 	if err != nil {
 		return nil, nil, err
 	}
-	sub, err := event.NewSubscription(func(quit <-chan struct{}) error {
+	sub := event.NewSubscription(func(quit <-chan struct{}) error {
 		for _, log := range buff {
 			select {
 			case logs <- log:
@@ -470,11 +470,8 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
 			}
 		}
 		return nil
-	}), nil
+	})
 
-	if err != nil {
-		return nil, nil, err
-	}
 	return logs, sub, nil
 }
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (arguments Arguments) Copy(v interface{}, values []interface{}) error {`
`127`	`127`	`return arguments.copyAtomic(v, values[0])`
`128`	`128`	`}`
`129`	`129`
`130`		`-// unpackAtomic unpacks ( hexdata -> go ) a single value`
	`130`	`+// copyAtomic copies ( hexdata -> go ) a single value`
`131`	`131`	`func (arguments Arguments) copyAtomic(v interface{}, marshalledValues interface{}) error {`
`132`	`132`	`dst := reflect.ValueOf(v).Elem()`
`133`	`133`	`src := reflect.ValueOf(marshalledValues)`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ func (c BoundContract) FilterLogs(opts FilterOpts, name string, query ...[]int`
`461`	`461`	`if err != nil {`
`462`	`462`	`return nil, nil, err`
`463`	`463`	`}`
`464`		`- sub, err := event.NewSubscription(func(quit <-chan struct{}) error {`
	`464`	`+ sub := event.NewSubscription(func(quit <-chan struct{}) error {`
`465`	`465`	`for _, log := range buff {`
`466`	`466`	`select {`
`467`	`467`	`case logs <- log:`
`@@ -470,11 +470,8 @@ func (c BoundContract) FilterLogs(opts FilterOpts, name string, query ...[]int`
`470`	`470`	`}`
`471`	`471`	`}`
`472`	`472`	`return nil`
`473`		`- }), nil`
	`473`	`+ })`
`474`	`474`
`475`		`- if err != nil {`
`476`		`- return nil, nil, err`
`477`		`- }`
`478`	`475`	`return logs, sub, nil`
`479`	`476`	`}`
`480`	`477`