Skip to content

Commit a3cba69

Browse files
committed
Merge branch 'op-geth-v1.101503.0-rc.3' into feat/bump-op-geth-v1.101503.0-rc.3
# Conflicts: # params/protocol_params.go
2 parents 90210c2 + 27ec85a commit a3cba69

File tree

290 files changed

+6104
-4389
lines changed

Some content is hidden

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

290 files changed

+6104
-4389
lines changed

.circleci/config.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
orbs:
44
gcp-cli: circleci/gcp-cli@3.0.1
55
slack: circleci/slack@4.10.1
6-
utils: ethereum-optimism/circleci-utils@0.0.8
6+
utils: ethereum-optimism/circleci-utils@1.0.13
77

88
parameters:
99
go_version:
@@ -84,10 +84,6 @@ jobs:
8484
if [ "$CIRCLE_PROJECT_REPONAME" == "op-geth" ] && [ "$CIRCLE_PROJECT_USERNAME" == "ethereum-optimism" ]; then
8585
echo "op-geth.optimism.io" > /tmp/pages/CNAME
8686
fi
87-
- utils/get-github-access-token:
88-
private-key-str: GITHUB_APP_KEY
89-
app-id: GITHUB_APP_ID
90-
repo: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
9187
- utils/github-pages-deploy:
9288
src-pages-dir: /tmp/pages
9389
docker-release:

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ linters:
2626
- gocheckcompilerdirectives
2727
- reassign
2828
- mirror
29-
- tenv
29+
- usetesting
3030
### linters we tried and will not be using:
3131
###
3232
# - structcheck # lots of false positives

.mailmap

Lines changed: 82 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Aaron Kumavis <kumavis@users.noreply.github.com>
55
Abel Nieto <abel.nieto90@gmail.com>
66
Abel Nieto <abel.nieto90@gmail.com> <anietoro@uwaterloo.ca>
77

8+
Adrian Sutton <adrian@oplabs.co>
9+
Adrian Sutton <adrian@oplabs.co> <adrian@symphonious.net>
10+
811
Afri Schoedon <58883403+q9f@users.noreply.github.com>
912
Afri Schoedon <5chdn@users.noreply.github.com> <58883403+q9f@users.noreply.github.com>
1013

@@ -22,6 +25,9 @@ Alexey Akhunov <akhounov@gmail.com>
2225

2326
Alon Muroch <alonmuroch@gmail.com>
2427

28+
Andrei Silviu Dragnea <andreidragnea.dev@gmail.com>
29+
Andrei Silviu Dragnea <andreidragnea.dev@gmail.com> <andreisilviudragnea@gmail.com>
30+
2531
Andrey Petrov <shazow@gmail.com>
2632
Andrey Petrov <shazow@gmail.com> <andrey.petrov@shazow.net>
2733

@@ -51,11 +57,17 @@ Chris Ziogas <ziogaschr@gmail.com> <ziogas_chr@hotmail.com>
5157

5258
Christoph Jentzsch <jentzsch.software@gmail.com>
5359

60+
Daniel Liu <liudaniel@qq.com>
61+
Daniel Liu <liudaniel@qq.com> <139250065@qq.com>
62+
5463
Diederik Loerakker <proto@protolambda.com>
5564

5665
Dimitry Khokhlov <winsvega@mail.ru>
5766

67+
Ha ĐANG <dvietha@gmail.com>
68+
5869
Domino Valdano <dominoplural@gmail.com>
70+
Domino Valdano <dominoplural@gmail.com> <jeff@okcupid.com>
5971

6072
Edgar Aroutiounian <edgar.factorial@gmail.com>
6173

@@ -82,6 +94,9 @@ Gavin Wood <i@gavwood.com>
8294

8395
Gregg Dourgarian <greggd@tempworks.com>
8496

97+
guangwu <guoguangwu@magic-shield.com>
98+
guangwu <guoguangwu@magic-shield.com> <guoguangwug@gmail.com>
99+
85100
Guillaume Ballet <gballet@gmail.com>
86101
Guillaume Ballet <gballet@gmail.com> <3272758+gballet@users.noreply.github.com>
87102

@@ -95,13 +110,21 @@ Heiko Hees <heiko@heiko.org>
95110
Henning Diedrich <hd@eonblast.com>
96111
Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>
97112

113+
henridf <henri@dubfer.com>
114+
henridf <henri@dubfer.com> <henridf@gmail.com>
115+
98116
Hwanjo Heo <34005989+hwanjo@users.noreply.github.com>
99117

118+
Ikko Eltociear Ashimine <eltociear@gmail.com>
119+
100120
Iskander (Alex) Sharipov <quasilyte@gmail.com>
101121
Iskander (Alex) Sharipov <quasilyte@gmail.com> <i.sharipov@corp.vk.com>
102122

103123
Jae Kwon <jkwon.work@gmail.com>
104124

125+
James Prestwich <james@prestwi.ch>
126+
James Prestwich <james@prestwi.ch> <10149425+prestwich@users.noreply.github.com>
127+
105128
Janoš Guljaš <janos@resenje.org> <janos@users.noreply.github.com>
106129
Janoš Guljaš <janos@resenje.org> Janos Guljas <janos@resenje.org>
107130

@@ -120,41 +143,72 @@ Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@users.noreply.github.com>
120143

121144
Jens Agerberg <github@agerberg.me>
122145

146+
Jeremy Schlatter <jeremy.schlatter@gmail.com>
147+
Jeremy Schlatter <jeremy.schlatter@gmail.com> <jeremy@jeremyschlatter.com>
148+
149+
John Chase <68833933+joohhnnn@users.noreply.github.com>
150+
123151
Joseph Chow <ethereum@outlook.com>
124152
Joseph Chow <ethereum@outlook.com> ethers <TODO>
125153

126-
127154
Joseph Goulden <joegoulden@gmail.com>
128155

129156
Justin Drake <drakefjustin@gmail.com>
130157

158+
Karl Bartel <karl.bartel@clabs.co>
159+
Karl Bartel <karl.bartel@clabs.co> <karl@karl.berlin>
160+
131161
Kenso Trabing <ktrabing@acm.org>
132162
Kenso Trabing <ktrabing@acm.org> <kenso.trabing@bloomwebsite.com>
133163

164+
Liyi Guo <102356659+colinlyguo@users.noreply.github.com>
165+
166+
lmittmann <3458786+lmittmann@users.noreply.github.com>
167+
lmittmann <3458786+lmittmann@users.noreply.github.com> <lmittmann@users.noreply.github.com>
168+
134169
Liang Ma <liangma@liangbit.com>
135170
Liang Ma <liangma@liangbit.com> <liangma.ul@gmail.com>
136171

137172
Louis Holbrook <dev@holbrook.no>
138173
Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com>
139174

175+
makcandrov <makcandrov@proton.me>
176+
makcandrov <makcandrov@proton.me> <108467407+makcandrov@users.noreply.github.com>
177+
140178
Maran Hidskes <maran.hidskes@gmail.com>
141179

142180
Marian Oancea <contact@siteshop.ro>
143181

144182
Martin Becze <mjbecze@gmail.com>
145183
Martin Becze <mjbecze@gmail.com> <wanderer@users.noreply.github.com>
146184

185+
Martin Holst Swende <martin@swende.se>
186+
147187
Martin Lundfall <martin.lundfall@protonmail.com>
148188

149-
Matt Garnett <14004106+lightclient@users.noreply.github.com>
189+
Marius van der Wijden <m.vanderwijden@live.de>
190+
Marius van der Wijden <m.vanderwijden@live.de> <115323661+vdwijden@users.noreply.github.com>
191+
192+
Matt Garnett <lightclient@protonmail.com>
193+
Matt Garnett <lightclient@protonmail.com> <14004106+lightclient@users.noreply.github.com>
150194

151195
Matthew Halpern <matthalp@gmail.com>
152196
Matthew Halpern <matthalp@gmail.com> <matthalp@google.com>
153197

198+
meowsbits <b5c6@protonmail.com>
199+
meowsbits <b5c6@protonmail.com> <45600330+meowsbits@users.noreply.github.com>
200+
154201
Michael Riabzev <michael@starkware.co>
155202

203+
Michael de Hoog <michael.dehoog@gmail.com>
204+
Michael de Hoog <michael.dehoog@gmail.com> <michael.dehoog@coinbase.com>
205+
156206
Nchinda Nchinda <nchinda2@gmail.com>
157207

208+
Nebojsa Urosevic <nebojsa94@users.noreply.github.com>
209+
210+
nedifi <103940716+nedifi@users.noreply.github.com>
211+
158212
Nick Dodson <silentcicero@outlook.com>
159213

160214
Nick Johnson <arachnid@notdot.net>
@@ -169,6 +223,9 @@ Olivier Hervieu <olivier.hervieu@gmail.com>
169223
Pascal Dierich <pascal@merkleplant.xyz>
170224
Pascal Dierich <pascal@merkleplant.xyz> <pascal@pascaldierich.com>
171225

226+
Paweł Bylica <chfast@gmail.com>
227+
Paweł Bylica <chfast@gmail.com> <pawel@ethereum.org>
228+
172229
RJ Catalano <catalanor0220@gmail.com>
173230
RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com>
174231

@@ -179,8 +236,22 @@ Rene Lubov <41963722+renaynay@users.noreply.github.com>
179236
Robert Zaremba <robert@zaremba.ch>
180237
Robert Zaremba <robert@zaremba.ch> <robert.zaremba@scale-it.pl>
181238

239+
Roberto Bayardo <bayardo@alum.mit.edu>
240+
Roberto Bayardo <bayardo@alum.mit.edu> <roberto.bayardo@coinbase.com>
241+
182242
Roman Mandeleil <roman.mandeleil@gmail.com>
183243

244+
Sebastian Stammler <seb@oplabs.co>
245+
Sebastian Stammler <seb@oplabs.co> <stammler.s@gmail.com>
246+
247+
Seungbae Yu <dbadoy4874@gmail.com>
248+
Seungbae Yu <dbadoy4874@gmail.com> <72970043+dbadoy@users.noreply.github.com>
249+
250+
Sina Mahmoodi <1591639+s1na@users.noreply.github.com>
251+
252+
Steve Milk <wangpeculiar@gmail.com>
253+
Steve Milk <wangpeculiar@gmail.com> <915337710@qq.com>
254+
184255
Sorin Neacsu <sorin.neacsu@gmail.com>
185256
Sorin Neacsu <sorin.neacsu@gmail.com> <sorin@users.noreply.github.com>
186257

@@ -191,8 +262,14 @@ Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>
191262

192263
Thomas Bocek <tom@tomp2p.net>
193264

265+
tianyeyouyou <tianyeyouyou@gmail.com>
266+
tianyeyouyou <tianyeyouyou@gmail.com> <150894831+tianyeyouyou@users.noreply.github.com>
267+
194268
Tim Cooijmans <timcooijmans@gmail.com>
195269

270+
ucwong <ethereum2k@gmail.com>
271+
ucwong <ethereum2k@gmail.com> <ucwong@126.com>
272+
196273
Valentin Wüstholz <wuestholz@gmail.com>
197274
Valentin Wüstholz <wuestholz@gmail.com> <wuestholz@users.noreply.github.com>
198275

@@ -221,16 +298,14 @@ Xudong Liu <33193253+r1cs@users.noreply.github.com>
221298

222299
Yohann Léon <sybiload@gmail.com>
223300

301+
yzb <335357057@qq.com>
302+
yzb <335357057@qq.com> <flyingyzb@gmail.com>
303+
224304
Zachinquarantine <Zachinquarantine@protonmail.com>
225305
Zachinquarantine <Zachinquarantine@protonmail.com> <zachinquarantine@yahoo.com>
226306

227307
Ziyuan Zhong <zzy.albert@163.com>
228308

229309
Zsolt Felföldi <zsfelfoldi@gmail.com>
230310

231-
meowsbits <b5c6@protonmail.com>
232-
meowsbits <b5c6@protonmail.com> <45600330+meowsbits@users.noreply.github.com>
233-
234-
nedifi <103940716+nedifi@users.noreply.github.com>
235-
236311
Максим Чусовлянов <mchusovlianov@gmail.com>

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
os: linux
1616
arch: amd64
1717
dist: focal
18-
go: 1.23.x
18+
go: 1.24.x
1919
env:
2020
- docker
2121
services:
@@ -25,15 +25,15 @@ jobs:
2525
before_install:
2626
- export DOCKER_CLI_EXPERIMENTAL=enabled
2727
script:
28-
- go run build/ci.go dockerx -platform "linux/amd64,linux/arm64,linux/riscv64" -upload ethereum/client-go
28+
- go run build/ci.go dockerx -platform "linux/amd64,linux/arm64,linux/riscv64" -hub ethereum/client-go -upload
2929

3030
# This builder does the Linux Azure uploads
3131
- stage: build
3232
if: type = push
3333
os: linux
3434
dist: focal
3535
sudo: required
36-
go: 1.23.x
36+
go: 1.24.x
3737
env:
3838
- azure-linux
3939
git:
@@ -85,15 +85,15 @@ jobs:
8585
os: linux
8686
arch: amd64
8787
dist: focal
88-
go: 1.23.x
88+
go: 1.24.x
8989
script:
9090
- travis_wait 45 go run build/ci.go test $TEST_PACKAGES
9191

9292
- stage: build
9393
if: type = push
9494
os: linux
9595
dist: focal
96-
go: 1.22.x
96+
go: 1.23.x
9797
script:
9898
- travis_wait 45 go run build/ci.go test $TEST_PACKAGES
9999

@@ -102,7 +102,7 @@ jobs:
102102
if: type = cron || (type = push && tag ~= /^v[0-9]/)
103103
os: linux
104104
dist: focal
105-
go: 1.23.x
105+
go: 1.24.x
106106
env:
107107
- ubuntu-ppa
108108
git:
@@ -118,7 +118,7 @@ jobs:
118118
if: type = cron
119119
os: linux
120120
dist: focal
121-
go: 1.23.x
121+
go: 1.24.x
122122
env:
123123
- azure-purge
124124
git:
@@ -131,7 +131,7 @@ jobs:
131131
if: type = cron
132132
os: linux
133133
dist: focal
134-
go: 1.23.x
134+
go: 1.24.x
135135
env:
136136
- racetests
137137
script:

0 commit comments

Comments
 (0)