Skip to content

Commit

Permalink
Revert "Upstream merge from go-ethereum/v1.11.6 (ethereum#901)"
Browse files Browse the repository at this point in the history
This reverts commit bbfb201.
  • Loading branch information
0xsharma authored Aug 3, 2023
1 parent bbfb201 commit 9c8e572
Show file tree
Hide file tree
Showing 1,402 changed files with 181,552 additions and 204,536 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ and help.

## Configuration, dependencies, and tests

Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/geth-developer/dev-guide)
Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/devguide)
for more details on configuring your environment, managing project dependencies
and testing procedures.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ linters-settings:

issues:
exclude-rules:
- path: crypto/bn256/cloudflare/optate.go
- path: crypto/blake2b/
linters:
- deadcode
- path: crypto/bn256/cloudflare
Expand Down
226 changes: 56 additions & 170 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,237 +1,123 @@
Aaron Buchwald <aaron.buchwald56@gmail.com>

Aaron Kumavis <kumavis@users.noreply.github.com>

Abel Nieto <abel.nieto90@gmail.com>
Abel Nieto <abel.nieto90@gmail.com> <anietoro@uwaterloo.ca>

Afri Schoedon <58883403+q9f@users.noreply.github.com>
Afri Schoedon <5chdn@users.noreply.github.com> <58883403+q9f@users.noreply.github.com>

Alec Perseghin <aperseghin@gmail.com>

Aleksey Smyrnov <i@soar.name>

Alex Leverington <alex@ethdev.com>
Alex Leverington <alex@ethdev.com> <subtly@users.noreply.github.com>

Alex Pozhilenkov <alex_pozhilenkov@adoriasoft.com>
Alex Pozhilenkov <alex_pozhilenkov@adoriasoft.com> <leshiy12345678@gmail.com>

Alexey Akhunov <akhounov@gmail.com>

Alon Muroch <alonmuroch@gmail.com>
Jeffrey Wilcke <jeffrey@ethereum.org>
Jeffrey Wilcke <jeffrey@ethereum.org> <geffobscura@gmail.com>
Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@obscura.com>
Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@users.noreply.github.com>

Andrey Petrov <shazow@gmail.com>
Andrey Petrov <shazow@gmail.com> <andrey.petrov@shazow.net>
Viktor Trón <viktor.tron@gmail.com>

Arkadiy Paronyan <arkadiy@ethdev.com>
Joseph Goulden <joegoulden@gmail.com>

Armin Braun <me@obrown.io>
Nick Savers <nicksavers@gmail.com>

Aron Fischer <github@aron.guru> <homotopycolimit@users.noreply.github.com>
Maran Hidskes <maran.hidskes@gmail.com>

Austin Roberts <code@ausiv.com>
Austin Roberts <code@ausiv.com> <git@ausiv.com>
Taylor Gerring <taylor.gerring@gmail.com>
Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>

Bas van Kervel <bas@ethdev.com>
Bas van Kervel <bas@ethdev.com> <basvankervel@ziggo.nl>
Bas van Kervel <bas@ethdev.com> <basvankervel@gmail.com>
Bas van Kervel <bas@ethdev.com> <bas-vk@users.noreply.github.com>

Boqin Qin <bobbqqin@bupt.edu.cn>
Boqin Qin <bobbqqin@bupt.edu.cn> <Bobbqqin@gmail.com>

Casey Detrio <cdetrio@gmail.com>
Sven Ehlert <sven@ethdev.com>

Cheng Li <lob4tt@gmail.com>
Vitalik Buterin <v@buterin.com>

Chris Ziogas <ziogaschr@gmail.com>
Chris Ziogas <ziogaschr@gmail.com> <ziogas_chr@hotmail.com>
Marian Oancea <contact@siteshop.ro>

Christoph Jentzsch <jentzsch.software@gmail.com>

Diederik Loerakker <proto@protolambda.com>

Dimitry Khokhlov <winsvega@mail.ru>

Domino Valdano <dominoplural@gmail.com>
Domino Valdano <dominoplural@gmail.com> <jeff@okcupid.com>

Edgar Aroutiounian <edgar.factorial@gmail.com>

Elliot Shepherd <elliot@identitii.com>

Enrique Fynn <enriquefynn@gmail.com>

Enrique Fynn <me@enriquefynn.com>
Enrique Fynn <me@enriquefynn.com> <enriquefynn@gmail.com>

Ernesto del Toro <ernesto.deltoro@gmail.com>
Ernesto del Toro <ernesto.deltoro@gmail.com> <ernestodeltoro@users.noreply.github.com>

Everton Fraga <ev@ethereum.org>

Felix Lange <fjl@twurst.com>
Felix Lange <fjl@twurst.com> <fjl@users.noreply.github.com>
Heiko Hees <heiko@heiko.org>

Frank Wang <eternnoir@gmail.com>
Alex Leverington <alex@ethdev.com>
Alex Leverington <alex@ethdev.com> <subtly@users.noreply.github.com>

Gary Rong <garyrong0905@gmail.com>
Zsolt Felföldi <zsfelfoldi@gmail.com>

Gavin Wood <i@gavwood.com>

Gregg Dourgarian <greggd@tempworks.com>

Guillaume Ballet <gballet@gmail.com>
Guillaume Ballet <gballet@gmail.com> <3272758+gballet@users.noreply.github.com>

Guillaume Nicolas <guin56@gmail.com>
Martin Becze <mjbecze@gmail.com>
Martin Becze <mjbecze@gmail.com> <wanderer@users.noreply.github.com>

Hanjiang Yu <delacroix.yu@gmail.com>
Hanjiang Yu <delacroix.yu@gmail.com> <42531996+de1acr0ix@users.noreply.github.com>
Dimitry Khokhlov <winsvega@mail.ru>

Heiko Hees <heiko@heiko.org>
Roman Mandeleil <roman.mandeleil@gmail.com>

Henning Diedrich <hd@eonblast.com>
Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>
Alec Perseghin <aperseghin@gmail.com>

Hwanjo Heo <34005989+hwanjo@users.noreply.github.com>
Alon Muroch <alonmuroch@gmail.com>

Iskander (Alex) Sharipov <quasilyte@gmail.com>
Iskander (Alex) Sharipov <quasilyte@gmail.com> <i.sharipov@corp.vk.com>
Arkadiy Paronyan <arkadiy@ethdev.com>

Jae Kwon <jkwon.work@gmail.com>

Janoš Guljaš <janos@resenje.org> <janos@users.noreply.github.com>
Janoš Guljaš <janos@resenje.org> Janos Guljas <janos@resenje.org>
Aaron Kumavis <kumavis@users.noreply.github.com>

Jared Wasinger <j-wasinger@hotmail.com>
Nick Dodson <silentcicero@outlook.com>

Jason Carver <jacarver@linkedin.com>
Jason Carver <jacarver@linkedin.com> <ut96caarrs@snkmail.com>

Javier Peletier <jm@epiclabs.io>
Javier Peletier <jm@epiclabs.io> <jpeletier@users.noreply.github.com>

Jeffrey Wilcke <jeffrey@ethereum.org>
Jeffrey Wilcke <jeffrey@ethereum.org> <geffobscura@gmail.com>
Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@obscura.com>
Jeffrey Wilcke <jeffrey@ethereum.org> <obscuren@users.noreply.github.com>

Jens Agerberg <github@agerberg.me>

Joseph Chow <ethereum@outlook.com>
Joseph Chow <ethereum@outlook.com> ethers <TODO>

Enrique Fynn <enriquefynn@gmail.com>

Joseph Goulden <joegoulden@gmail.com>

Justin Drake <drakefjustin@gmail.com>

Kenso Trabing <ktrabing@acm.org>
Kenso Trabing <ktrabing@acm.org> <kenso.trabing@bloomwebsite.com>

Liang Ma <liangma@liangbit.com>
Liang Ma <liangma@liangbit.com> <liangma.ul@gmail.com>
Vincent G <caktux@gmail.com>

Louis Holbrook <dev@holbrook.no>
Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com>
RJ Catalano <catalanor0220@gmail.com>
RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com>

Maran Hidskes <maran.hidskes@gmail.com>
Nchinda Nchinda <nchinda2@gmail.com>

Marian Oancea <contact@siteshop.ro>
Aron Fischer <github@aron.guru> <homotopycolimit@users.noreply.github.com>

Martin Becze <mjbecze@gmail.com>
Martin Becze <mjbecze@gmail.com> <wanderer@users.noreply.github.com>
Vlad Gluhovsky <gluk256@users.noreply.github.com>

Martin Lundfall <martin.lundfall@protonmail.com>
Ville Sundell <github@solarius.fi>

Matt Garnett <14004106+lightclient@users.noreply.github.com>
Elliot Shepherd <elliot@identitii.com>

Matthew Halpern <matthalp@gmail.com>
Matthew Halpern <matthalp@gmail.com> <matthalp@google.com>
Yohann Léon <sybiload@gmail.com>

Michael Riabzev <michael@starkware.co>
Gregg Dourgarian <greggd@tempworks.com>

Nchinda Nchinda <nchinda2@gmail.com>
Casey Detrio <cdetrio@gmail.com>

Nick Dodson <silentcicero@outlook.com>
Jens Agerberg <github@agerberg.me>

Nick Johnson <arachnid@notdot.net>

Nick Savers <nicksavers@gmail.com>
Henning Diedrich <hd@eonblast.com>
Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>

Nishant Das <nishdas93@gmail.com>
Nishant Das <nishdas93@gmail.com> <nish1993@hotmail.com>
Felix Lange <fjl@twurst.com>
Felix Lange <fjl@twurst.com> <fjl@users.noreply.github.com>

Olivier Hervieu <olivier.hervieu@gmail.com>
Максим Чусовлянов <mchusovlianov@gmail.com>

Pascal Dierich <pascal@merkleplant.xyz>
Pascal Dierich <pascal@merkleplant.xyz> <pascal@pascaldierich.com>
Louis Holbrook <dev@holbrook.no>
Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com>

RJ Catalano <catalanor0220@gmail.com>
RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com>
Thomas Bocek <tom@tomp2p.net>

Ralph Caraveo <deckarep@gmail.com>
Victor Tran <vu.tran54@gmail.com>

Rene Lubov <41963722+renaynay@users.noreply.github.com>
Justin Drake <drakefjustin@gmail.com>

Robert Zaremba <robert@zaremba.ch>
Robert Zaremba <robert@zaremba.ch> <robert.zaremba@scale-it.pl>
Frank Wang <eternnoir@gmail.com>

Roman Mandeleil <roman.mandeleil@gmail.com>
Gary Rong <garyrong0905@gmail.com>

Guillaume Nicolas <guin56@gmail.com>

Sorin Neacsu <sorin.neacsu@gmail.com>
Sorin Neacsu <sorin.neacsu@gmail.com> <sorin@users.noreply.github.com>

Sven Ehlert <sven@ethdev.com>

Taylor Gerring <taylor.gerring@gmail.com>
Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>

Thomas Bocek <tom@tomp2p.net>

Tim Cooijmans <timcooijmans@gmail.com>

Valentin Wüstholz <wuestholz@gmail.com>
Valentin Wüstholz <wuestholz@gmail.com> <wuestholz@users.noreply.github.com>

Victor Tran <vu.tran54@gmail.com>

Viktor Trón <viktor.tron@gmail.com>

Ville Sundell <github@solarius.fi>

Vincent G <caktux@gmail.com>

Vitalik Buterin <v@buterin.com>

Vlad Gluhovsky <gluk256@gmail.com>
Vlad Gluhovsky <gluk256@gmail.com> <gluk256@users.noreply.github.com>

Wenshao Zhong <wzhong20@uic.edu>
Wenshao Zhong <wzhong20@uic.edu> <11510383@mail.sustc.edu.cn>
Wenshao Zhong <wzhong20@uic.edu> <374662347@qq.com>

Will Villanueva <hello@willvillanueva.com>

Xiaobing Jiang <s7v7nislands@gmail.com>

Xudong Liu <33193253+r1cs@users.noreply.github.com>

Yohann Léon <sybiload@gmail.com>

Zachinquarantine <Zachinquarantine@protonmail.com>
Zachinquarantine <Zachinquarantine@protonmail.com> <zachinquarantine@yahoo.com>

Ziyuan Zhong <zzy.albert@163.com>

Zsolt Felföldi <zsfelfoldi@gmail.com>

meowsbits <b5c6@protonmail.com>
meowsbits <b5c6@protonmail.com> <45600330+meowsbits@users.noreply.github.com>

nedifi <103940716+nedifi@users.noreply.github.com>
Armin Braun <me@obrown.io>

Максим Чусовлянов <mchusovlianov@gmail.com>
Ernesto del Toro <ernesto.deltoro@gmail.com>
Ernesto del Toro <ernesto.deltoro@gmail.com> <ernestodeltoro@users.noreply.github.com>
Loading

0 comments on commit 9c8e572

Please sign in to comment.