Skip to content

Commit b92e93f

Browse files
Merge pull request #31 from zama-ai/update-geth
Update geth
2 parents 3599f1d + 25a2d5c commit b92e93f

File tree

990 files changed

+66644
-35136
lines changed

Some content is hidden

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

990 files changed

+66644
-35136
lines changed

.github/CODEOWNERS

+27-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
# Lines starting with '#' are comments.
22
# Each line is a file pattern followed by one or more owners.
33

4-
accounts/usbwallet @karalabe
5-
accounts/scwallet @gballet
6-
accounts/abi @gballet @MariusVanDerWijden
7-
cmd/clef @holiman
8-
consensus @karalabe
9-
core/ @karalabe @holiman @rjl493456442
10-
eth/ @karalabe @holiman @rjl493456442
11-
eth/catalyst/ @gballet
4+
accounts/usbwallet/ @gballet
5+
accounts/scwallet/ @gballet
6+
accounts/abi/ @gballet @MariusVanDerWijden
7+
beacon/engine/ @MariusVanDerWijden @lightclient @fjl
8+
beacon/light/ @zsfelfoldi
9+
beacon/merkle/ @zsfelfoldi
10+
beacon/types/ @zsfelfoldi @fjl
11+
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
18+
eth/catalyst/ @MariusVanDerWijden @lightclient @fjl @jwasinger
1219
eth/tracers/ @s1na
20+
ethclient/ @fjl
21+
ethdb/ @rjl493456442
22+
event/ @fjl
23+
trie/ @rjl493456442
24+
triedb/ @rjl493456442
25+
core/tracing/ @s1na
1326
graphql/ @s1na
14-
les/ @zsfelfoldi @rjl493456442
15-
light/ @zsfelfoldi @rjl493456442
27+
internal/ethapi/ @fjl @s1na @lightclient
28+
internal/era/ @lightclient
29+
metrics/ @holiman
30+
miner/ @MariusVanDerWijden @holiman @fjl @rjl493456442
1631
node/ @fjl
1732
p2p/ @fjl @zsfelfoldi
33+
rlp/ @fjl
34+
params/ @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
1835
rpc/ @fjl @holiman
19-
p2p/simulations @fjl
20-
p2p/protocols @fjl
21-
p2p/testing @fjl
2236
signer/ @holiman

.gitignore

+9-16
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,25 +23,23 @@ 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
3437

3538
# IdeaIDE
3639
.idea
40+
*.iml
3741

3842
# VS Code
3943
.vscode
4044

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-
5245
tests/spec-tests/

.golangci.yml

+30-11
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
run:
44
timeout: 20m
55
tests: true
6-
# default is true. Enables skipping of directories:
7-
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
8-
skip-dirs-use-default: true
9-
skip-files:
10-
- core/genesis_alloc.go
116

127
linters:
138
disable-all: true
@@ -23,9 +18,16 @@ linters:
2318
- staticcheck
2419
- bidichk
2520
- durationcheck
26-
- exportloopref
21+
- copyloopvar
2722
- whitespace
28-
23+
- revive # only certain checks enabled
24+
- durationcheck
25+
- gocheckcompilerdirectives
26+
- reassign
27+
- mirror
28+
- usetesting
29+
### linters we tried and will not be using:
30+
###
2931
# - structcheck # lots of false positives
3032
# - errcheck #lot of false positives
3133
# - contextcheck
@@ -38,21 +40,38 @@ linters:
3840
linters-settings:
3941
gofmt:
4042
simplify: true
43+
revive:
44+
enable-all-rules: false
45+
# here we enable specific useful rules
46+
# see https://golangci-lint.run/usage/linters/#revive for supported rules
47+
rules:
48+
- name: receiver-naming
49+
severity: warning
50+
disabled: false
51+
exclude: [""]
4152

4253
issues:
54+
# default is true. Enables skipping of directories:
55+
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
56+
exclude-dirs-use-default: true
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

+82-7
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>

0 commit comments

Comments
 (0)