Skip to content

Commit f8bf2e1

Browse files
Jamq2Jamq2
authored
Merge branch 'ethereum:master' into patch-1
2 parents bf24c3b + 5e6f737 commit f8bf2e1

File tree

1,276 files changed

+172282
-48613
lines changed

Some content is hidden

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

1,276 files changed

+172282
-48613
lines changed

‎.gitea/workflows/release-azure-cleanup.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
on:
2+
workflow_dispatch:
3+
4+
### Note we cannot use cron-triggered builds right now, Gitea seems to have
5+
### a few bugs in that area. So this workflow is scheduled using an external
6+
### triggering mechanism and workflow_dispatch.
7+
#
8+
# schedule:
9+
# - cron: '0 15 * * *'
10+
11+
jobs:
12+
azure-cleanup:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Set up Go
18+
uses: actions/setup-go@v5
19+
with:
20+
go-version: 1.24
21+
cache: false
22+
23+
- name: Run cleanup script
24+
run: |
25+
go run build/ci.go purge -store gethstore/builds -days 14
26+
env:
27+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}

‎.gitea/workflows/release-ppa.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
on:
2+
push:
3+
tags:
4+
- "v*"
5+
workflow_dispatch:
6+
7+
### Note we cannot use cron-triggered builds right now, Gitea seems to have
8+
### a few bugs in that area. So this workflow is scheduled using an external
9+
### triggering mechanism and workflow_dispatch.
10+
#
11+
# schedule:
12+
# - cron: '0 16 * * *'
13+
14+
15+
jobs:
16+
ppa:
17+
name: PPA Upload
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
22+
- name: Show environment
23+
run: |
24+
env
25+
26+
- name: Set up Go
27+
uses: actions/setup-go@v5
28+
with:
29+
go-version: 1.24
30+
cache: false
31+
32+
- name: Install deb toolchain
33+
run: |
34+
apt-get update
35+
apt-get -yq --no-install-suggests --no-install-recommends install devscripts debhelper dput fakeroot
36+
37+
- name: Add launchpad to known_hosts
38+
run: |
39+
echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
40+
41+
- name: Run ci.go
42+
run: |
43+
go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
44+
env:
45+
PPA_SIGNING_KEY: ${{ secrets.PPA_SIGNING_KEY }}
46+
PPA_SSH_KEY: ${{ secrets.PPA_SSH_KEY }}

‎.gitea/workflows/release.yml‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
on:
2+
push:
3+
branches:
4+
- "master"
5+
tags:
6+
- "v*"
7+
workflow_dispatch:
8+
9+
jobs:
10+
linux-intel:
11+
name: Linux Build
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Set up Go
17+
uses: actions/setup-go@v5
18+
with:
19+
go-version: 1.24
20+
cache: false
21+
22+
- name: Install cross toolchain
23+
run: |
24+
apt-get update
25+
apt-get -yq --no-install-suggests --no-install-recommends install gcc-multilib
26+
27+
- name: Build (amd64)
28+
run: |
29+
go run build/ci.go install -static -arch amd64 -dlgo
30+
31+
- name: Create/upload archive (amd64)
32+
run: |
33+
go run build/ci.go archive -arch amd64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
34+
rm -f build/bin/*
35+
env:
36+
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
37+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
38+
39+
- name: Build (386)
40+
run: |
41+
go run build/ci.go install -static -arch 386 -dlgo
42+
43+
- name: Create/upload archive (386)
44+
run: |
45+
go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
46+
rm -f build/bin/*
47+
env:
48+
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
49+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
50+
51+
linux-arm:
52+
name: Linux Build (arm)
53+
runs-on: ubuntu-latest
54+
steps:
55+
- uses: actions/checkout@v4
56+
57+
- name: Set up Go
58+
uses: actions/setup-go@v5
59+
with:
60+
go-version: 1.24
61+
cache: false
62+
63+
- name: Install cross toolchain
64+
run: |
65+
apt-get update
66+
apt-get -yq --no-install-suggests --no-install-recommends install gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
67+
ln -s /usr/include/asm-generic /usr/include/asm
68+
69+
- name: Build (arm64)
70+
run: |
71+
go run build/ci.go install -static -dlgo -arch arm64 -cc aarch64-linux-gnu-gcc
72+
73+
- name: Create/upload archive (arm64)
74+
run: |
75+
go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
76+
rm -fr build/bin/*
77+
env:
78+
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
79+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
80+
81+
- name: Run build (arm5)
82+
run: |
83+
go run build/ci.go install -static -dlgo -arch arm -cc arm-linux-gnueabi-gcc
84+
env:
85+
GOARM: "5"
86+
87+
- name: Create/upload archive (arm5)
88+
run: |
89+
go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
90+
env:
91+
GOARM: "5"
92+
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
93+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
94+
95+
- name: Run build (arm6)
96+
run: |
97+
go run build/ci.go install -static -dlgo -arch arm -cc arm-linux-gnueabi-gcc
98+
env:
99+
GOARM: "6"
100+
101+
- name: Create/upload archive (arm6)
102+
run: |
103+
go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
104+
rm -fr build/bin/*
105+
env:
106+
GOARM: "6"
107+
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
108+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
109+
110+
- name: Run build (arm7)
111+
run: |
112+
go run build/ci.go install -static -dlgo -arch arm -cc arm-linux-gnueabi-gcc
113+
env:
114+
GOARM: "7"
115+
116+
- name: Create/upload archive (arm7)
117+
run: |
118+
go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
119+
rm -fr build/bin/*
120+
env:
121+
GOARM: "7"
122+
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
123+
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
124+
125+
keeper:
126+
name: Keeper Build
127+
runs-on: ubuntu-latest
128+
steps:
129+
- uses: actions/checkout@v4
130+
131+
- name: Set up Go
132+
uses: actions/setup-go@v5
133+
with:
134+
go-version: 1.24
135+
cache: false
136+
137+
- name: Install cross toolchain
138+
run: |
139+
apt-get update
140+
apt-get -yq --no-install-suggests --no-install-recommends install gcc-multilib
141+
142+
- name: Build (amd64)
143+
run: |
144+
go run build/ci.go keeper -dlgo
145+
146+
windows:
147+
name: Windows Build
148+
runs-on: "win-11"
149+
steps:
150+
- uses: actions/checkout@v4
151+
152+
- name: Set up Go
153+
uses: actions/setup-go@v5
154+
with:
155+
go-version: 1.24
156+
cache: false
157+
158+
# Note: gcc.exe only works properly if the corresponding bin/ directory is
159+
# contained in PATH.
160+
161+
- name: "Build (amd64)"
162+
shell: cmd
163+
run: |
164+
set PATH=%GETH_MINGW%\bin;%PATH%
165+
go run build/ci.go install -dlgo -arch amd64 -cc %GETH_MINGW%\bin\gcc.exe
166+
env:
167+
GETH_MINGW: 'C:\msys64\mingw64'
168+
169+
- name: "Build (386)"
170+
shell: cmd
171+
run: |
172+
set PATH=%GETH_MINGW%\bin;%PATH%
173+
go run build/ci.go install -dlgo -arch 386 -cc %GETH_MINGW%\bin\gcc.exe
174+
env:
175+
GETH_MINGW: 'C:\msys64\mingw32'
176+
177+
docker:
178+
name: Docker Image
179+
runs-on: ubuntu-latest
180+
steps:
181+
- uses: actions/checkout@v4
182+
183+
- name: Set up QEMU
184+
uses: docker/setup-qemu-action@v3
185+
186+
- name: Set up Docker Buildx
187+
uses: docker/setup-buildx-action@v3
188+
189+
- name: Set up Go
190+
uses: actions/setup-go@v5
191+
with:
192+
go-version: 1.24
193+
cache: false
194+
195+
- name: Run docker build
196+
env:
197+
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
198+
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
199+
run: |
200+
go run build/ci.go dockerx -platform linux/amd64,linux/arm64,linux/riscv64 -upload

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,25 @@ beacon/light/ @zsfelfoldi
99
beacon/merkle/ @zsfelfoldi
1010
beacon/types/ @zsfelfoldi @fjl
1111
beacon/params/ @zsfelfoldi @fjl
12-
cmd/clef/ @holiman
13-
cmd/evm/ @holiman @MariusVanDerWijden @lightclient
14-
core/state/ @rjl493456442 @holiman
15-
crypto/ @gballet @jwasinger @holiman @fjl
16-
core/ @holiman @rjl493456442
17-
eth/ @holiman @rjl493456442
12+
cmd/evm/ @MariusVanDerWijden @lightclient
13+
core/state/ @rjl493456442
14+
crypto/ @gballet @jwasinger @fjl
15+
core/ @rjl493456442
16+
eth/ @rjl493456442
1817
eth/catalyst/ @MariusVanDerWijden @lightclient @fjl @jwasinger
1918
eth/tracers/ @s1na
2019
ethclient/ @fjl
2120
ethdb/ @rjl493456442
2221
event/ @fjl
23-
trie/ @rjl493456442
22+
trie/ @rjl493456442 @gballet
2423
triedb/ @rjl493456442
2524
core/tracing/ @s1na
2625
graphql/ @s1na
2726
internal/ethapi/ @fjl @s1na @lightclient
2827
internal/era/ @lightclient
29-
metrics/ @holiman
30-
miner/ @MariusVanDerWijden @holiman @fjl @rjl493456442
28+
miner/ @MariusVanDerWijden @fjl @rjl493456442
3129
node/ @fjl
3230
p2p/ @fjl @zsfelfoldi
3331
rlp/ @fjl
34-
params/ @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
35-
rpc/ @fjl @holiman
36-
signer/ @holiman
32+
params/ @fjl @gballet @rjl493456442 @zsfelfoldi
33+
rpc/ @fjl

0 commit comments

Comments
 (0)