Skip to content

Commit bef5e53

Browse files
feat(nibiru): geth v1.14 compatible with Nibiru: Merge pull request #9 from NibiruChain/ud/geth/v1.14.13
feat(nibiru): geth v1.14 compatible with Nibiru
2 parents 44e9249 + 12c6160 commit bef5e53

File tree

950 files changed

+64620
-45730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

950 files changed

+64620
-45730
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@
44
accounts/usbwallet @karalabe
55
accounts/scwallet @gballet
66
accounts/abi @gballet @MariusVanDerWijden
7+
beacon/engine @lightclient
78
cmd/clef @holiman
9+
cmd/evm @holiman @MariusVanDerWijden @lightclient
810
consensus @karalabe
911
core/ @karalabe @holiman @rjl493456442
1012
eth/ @karalabe @holiman @rjl493456442
11-
eth/catalyst/ @gballet
13+
eth/catalyst/ @gballet @lightclient
1214
eth/tracers/ @s1na
15+
core/tracing/ @s1na
1316
graphql/ @s1na
17+
internal/ethapi @lightclient
18+
internal/era @lightclient
1419
les/ @zsfelfoldi @rjl493456442
1520
light/ @zsfelfoldi @rjl493456442
1621
node/ @fjl
1722
p2p/ @fjl @zsfelfoldi
23+
params/ @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
1824
rpc/ @fjl @holiman
19-
p2p/simulations @fjl
20-
p2p/protocols @fjl
21-
p2p/testing @fjl
2225
signer/ @holiman

.github/workflows/go.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ jobs:
1111
build:
1212
runs-on: self-hosted
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Set up Go
16-
uses: actions/setup-go@v2
16+
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.21.4
18+
go-version: 1.23.0
19+
cache: false
1920
- name: Run tests
2021
run: go test -short ./...
2122
env:

.gitignore

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44
# or operating system, you probably want to add a global ignore instead:
55
# git config --global core.excludesfile ~/.gitignore_global
66

7-
/tmp
87
*/**/*un~
98
*/**/*.test
109
*un~
1110
.DS_Store
1211
*/**/.DS_Store
13-
.ethtest
14-
*/**/*tx_database*
15-
*/**/*dapps*
16-
build/_vendor/pkg
1712

1813
#*
1914
.#*
@@ -28,6 +23,14 @@ build/_vendor/pkg
2823
/build/bin/
2924
/geth*.zip
3025

26+
# used by the build/ci.go archive + upload tool
27+
/geth*.tar.gz
28+
/geth*.tar.gz.sig
29+
/geth*.tar.gz.asc
30+
/geth*.zip.sig
31+
/geth*.zip.asc
32+
33+
3134
# travis
3235
profile.tmp
3336
profile.cov
@@ -38,15 +41,4 @@ profile.cov
3841
# VS Code
3942
.vscode
4043

41-
# dashboard
42-
/dashboard/assets/flow-typed
43-
/dashboard/assets/node_modules
44-
/dashboard/assets/stats.json
45-
/dashboard/assets/bundle.js
46-
/dashboard/assets/bundle.js.map
47-
/dashboard/assets/package-lock.json
48-
49-
**/yarn-error.log
50-
logs/
51-
5244
tests/spec-tests/

.golangci.yml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ run:
66
# default is true. Enables skipping of directories:
77
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
88
skip-dirs-use-default: true
9-
skip-files:
10-
- core/genesis_alloc.go
119

1210
linters:
1311
disable-all: true
@@ -23,9 +21,16 @@ linters:
2321
- staticcheck
2422
- bidichk
2523
- durationcheck
26-
- exportloopref
24+
- copyloopvar
2725
- whitespace
28-
26+
- revive # only certain checks enabled
27+
- durationcheck
28+
- gocheckcompilerdirectives
29+
- reassign
30+
- mirror
31+
- tenv
32+
### linters we tried and will not be using:
33+
###
2934
# - structcheck # lots of false positives
3035
# - errcheck #lot of false positives
3136
# - contextcheck
@@ -38,21 +43,35 @@ linters:
3843
linters-settings:
3944
gofmt:
4045
simplify: true
46+
revive:
47+
enable-all-rules: false
48+
# here we enable specific useful rules
49+
# see https://golangci-lint.run/usage/linters/#revive for supported rules
50+
rules:
51+
- name: receiver-naming
52+
severity: warning
53+
disabled: false
54+
exclude: [""]
4155

4256
issues:
57+
exclude-files:
58+
- core/genesis_alloc.go
4359
exclude-rules:
4460
- path: crypto/bn256/cloudflare/optate.go
4561
linters:
4662
- deadcode
4763
- staticcheck
64+
- path: crypto/bn256/
65+
linters:
66+
- revive
67+
- path: cmd/utils/flags.go
68+
text: "SA1019: cfg.TxLookupLimit is deprecated: use 'TransactionHistory' instead."
69+
- path: cmd/utils/flags.go
70+
text: "SA1019: ethconfig.Defaults.TxLookupLimit is deprecated: use 'TransactionHistory' instead."
4871
- path: internal/build/pgp.go
4972
text: 'SA1019: "golang.org/x/crypto/openpgp" is deprecated: this package is unmaintained except for security fixes.'
5073
- path: core/vm/contracts.go
5174
text: 'SA1019: "golang.org/x/crypto/ripemd160" is deprecated: RIPEMD-160 is a legacy hash and should not be used for new applications.'
52-
- path: accounts/usbwallet/trezor.go
53-
text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
54-
- path: accounts/usbwallet/trezor/
55-
text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
5675
exclude:
5776
- 'SA1019: event.TypeMux is deprecated: use Feed'
5877
- 'SA1019: strings.Title is deprecated'

.mailmap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Diederik Loerakker <[email protected]>
5656
Dimitry Khokhlov <[email protected]>
5757

5858
Domino Valdano <[email protected]>
59-
6059

6160
Edgar Aroutiounian <[email protected]>
6261

.travis.yml

Lines changed: 32 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ jobs:
99
- azure-osx
1010

1111
include:
12-
# These builders create the Docker sub-images for multi-arch push and each
13-
# will attempt to push the multi-arch image if they are the last builder
12+
# This builder create and push the Docker images for all architectures
1413
- stage: build
1514
if: type = push
1615
os: linux
1716
arch: amd64
18-
dist: bionic
19-
go: 1.21.x
17+
dist: focal
18+
go: 1.23.x
2019
env:
2120
- docker
2221
services:
@@ -26,44 +25,27 @@ jobs:
2625
before_install:
2726
- export DOCKER_CLI_EXPERIMENTAL=enabled
2827
script:
29-
- go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
30-
31-
- stage: build
32-
if: type = push
33-
os: linux
34-
arch: arm64
35-
dist: bionic
36-
go: 1.21.x
37-
env:
38-
- docker
39-
services:
40-
- docker
41-
git:
42-
submodules: false # avoid cloning ethereum/tests
43-
before_install:
44-
- export DOCKER_CLI_EXPERIMENTAL=enabled
45-
script:
46-
- go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
28+
- go run build/ci.go dockerx -platform "linux/amd64,linux/arm64,linux/riscv64" -upload ethereum/client-go
4729

4830
# This builder does the Linux Azure uploads
4931
- stage: build
5032
if: type = push
5133
os: linux
52-
dist: bionic
34+
dist: focal
5335
sudo: required
54-
go: 1.21.x
36+
go: 1.23.x
5537
env:
5638
- azure-linux
5739
git:
5840
submodules: false # avoid cloning ethereum/tests
59-
addons:
60-
apt:
61-
packages:
62-
- gcc-multilib
6341
script:
64-
# Build for the primary platforms that Trusty can manage
42+
# build amd64
6543
- go run build/ci.go install -dlgo
6644
- go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
45+
46+
# build 386
47+
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends install gcc-multilib
48+
- git status --porcelain
6749
- go run build/ci.go install -dlgo -arch 386
6850
- go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
6951

@@ -85,61 +67,48 @@ jobs:
8567
if: type = push
8668
os: osx
8769
osx_image: xcode14.2
88-
go: 1.21.x
70+
go: 1.23.1 # See https://github.com/ethereum/go-ethereum/pull/30478
8971
env:
9072
- azure-osx
9173
git:
9274
submodules: false # avoid cloning ethereum/tests
9375
script:
76+
- ln -sf /Users/travis/gopath/bin/go1.23.1 /usr/local/bin/go # Work around travis go-setup bug
9477
- go run build/ci.go install -dlgo
9578
- go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
9679
- go run build/ci.go install -dlgo -arch arm64
9780
- go run build/ci.go archive -arch arm64 -type tar -signer OSX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
9881

9982
# These builders run the tests
10083
- stage: build
84+
if: type = push
10185
os: linux
10286
arch: amd64
103-
dist: bionic
104-
go: 1.21.x
87+
dist: focal
88+
go: 1.23.x
10589
script:
106-
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
107-
108-
- stage: build
109-
if: type = pull_request
110-
os: linux
111-
arch: arm64
112-
dist: bionic
113-
go: 1.20.x
114-
script:
115-
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
90+
- travis_wait 45 go run build/ci.go test $TEST_PACKAGES
11691

11792
- stage: build
93+
if: type = push
11894
os: linux
119-
dist: bionic
120-
go: 1.20.x
95+
dist: focal
96+
go: 1.22.x
12197
script:
122-
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
98+
- travis_wait 45 go run build/ci.go test $TEST_PACKAGES
12399

124100
# This builder does the Ubuntu PPA nightly uploads
125101
- stage: build
126102
if: type = cron || (type = push && tag ~= /^v[0-9]/)
127103
os: linux
128-
dist: bionic
129-
go: 1.21.x
104+
dist: focal
105+
go: 1.23.x
130106
env:
131107
- ubuntu-ppa
132108
git:
133109
submodules: false # avoid cloning ethereum/tests
134-
addons:
135-
apt:
136-
packages:
137-
- devscripts
138-
- debhelper
139-
- dput
140-
- fakeroot
141-
- python-bzrlib
142-
- python-paramiko
110+
before_install:
111+
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends install devscripts debhelper dput fakeroot
143112
script:
144113
- echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
145114
- go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
@@ -148,8 +117,8 @@ jobs:
148117
- stage: build
149118
if: type = cron
150119
os: linux
151-
dist: bionic
152-
go: 1.21.x
120+
dist: focal
121+
go: 1.23.x
153122
env:
154123
- azure-purge
155124
git:
@@ -161,8 +130,9 @@ jobs:
161130
- stage: build
162131
if: type = cron
163132
os: linux
164-
dist: bionic
165-
go: 1.21.x
133+
dist: focal
134+
go: 1.23.x
135+
env:
136+
- racetests
166137
script:
167-
- travis_wait 30 go run build/ci.go test -race $TEST_PACKAGES
168-
138+
- travis_wait 60 go run build/ci.go test -race $TEST_PACKAGES

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG VERSION=""
44
ARG BUILDNUM=""
55

66
# Build Geth in a stock Go builder container
7-
FROM golang:1.21-alpine as builder
7+
FROM golang:1.23-alpine AS builder
88

99
RUN apk add --no-cache gcc musl-dev linux-headers git
1010

@@ -25,7 +25,7 @@ COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
2525
EXPOSE 8545 8546 30303 30303/udp
2626
ENTRYPOINT ["geth"]
2727

28-
# Add some metadata labels to help programatic image consumption
28+
# Add some metadata labels to help programmatic image consumption
2929
ARG COMMIT=""
3030
ARG VERSION=""
3131
ARG BUILDNUM=""

Dockerfile.alltools

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG VERSION=""
44
ARG BUILDNUM=""
55

66
# Build Geth in a stock Go builder container
7-
FROM golang:1.21-alpine as builder
7+
FROM golang:1.23-alpine AS builder
88

99
RUN apk add --no-cache gcc musl-dev linux-headers git
1010

@@ -14,6 +14,13 @@ COPY go.sum /go-ethereum/
1414
RUN cd /go-ethereum && go mod download
1515

1616
ADD . /go-ethereum
17+
18+
# This is not strictly necessary, but it matches the "Dockerfile" steps, thus
19+
# makes it so that under certain circumstances, the docker layer can be cached,
20+
# and the builder can jump to the next (build all) command, with the go cache fully loaded.
21+
#
22+
RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
23+
1724
RUN cd /go-ethereum && go run build/ci.go install -static
1825

1926
# Pull all binaries into a second stage deploy alpine container
@@ -24,7 +31,7 @@ COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
2431

2532
EXPOSE 8545 8546 30303 30303/udp
2633

27-
# Add some metadata labels to help programatic image consumption
34+
# Add some metadata labels to help programmatic image consumption
2835
ARG COMMIT=""
2936
ARG VERSION=""
3037
ARG BUILDNUM=""

0 commit comments

Comments
 (0)