Revert "Upstream merge from go-ethereum/v1.11.6"

.github/CONTRIBUTING.md

@@ -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.

.golangci.yml

@@ -146,7 +146,7 @@ linters-settings:
 
 issues:
   exclude-rules:
-    - path: crypto/bn256/cloudflare/optate.go
+    - path: crypto/blake2b/
       linters:
         - deadcode
     - path: crypto/bn256/cloudflare

.mailmap

@@ -1,237 +1,123 @@
-Aaron Buchwald <[email protected]>
-
-Aaron Kumavis <[email protected]>
-
-Abel Nieto <[email protected]>
-Abel Nieto <[email protected]> <[email protected]>
-
-Afri Schoedon <[email protected]>
-Afri Schoedon <[email protected]> <[email protected]>
-
-Alec Perseghin <[email protected]>
-
-Aleksey Smyrnov <[email protected]>
-
-Alex Leverington <[email protected]>
-Alex Leverington <[email protected]> <[email protected]>
-
-Alex Pozhilenkov <[email protected]>
-Alex Pozhilenkov <[email protected]> <[email protected]>
-
-Alexey Akhunov <[email protected]>
-
-Alon Muroch <[email protected]>
+Jeffrey Wilcke <[email protected]>
+Jeffrey Wilcke <[email protected]> <[email protected]>
+Jeffrey Wilcke <[email protected]> <[email protected]>
+Jeffrey Wilcke <[email protected]> <[email protected]>
 
-Andrey Petrov <[email protected]>
-Andrey Petrov <[email protected]> <[email protected]>
+Viktor Trón <[email protected]>
 
-Arkadiy Paronyan <arkadiy@ethdev.com>
+Joseph Goulden <joegoulden@gmail.com>
 
-Armin Braun <[email protected]>
+Nick Savers <[email protected]>
 
-Aron Fischer <[email protected]> <[email protected].com>
+Maran Hidskes <maran.hidskes@gmail.com>
 
-Austin Roberts <code@ausiv.com>
-Austin Roberts <code@ausiv.com> <[email protected]>
+Taylor Gerring <taylor.gerring@gmail.com>
+Taylor Gerring <taylor.gerring@gmail.com> <[email protected]>
 
 Bas van Kervel <[email protected]>
 Bas van Kervel <[email protected]> <[email protected]>
 Bas van Kervel <[email protected]> <[email protected]>
 Bas van Kervel <[email protected]> <[email protected]>
 
-Boqin Qin <[email protected]>
-Boqin Qin <[email protected]> <[email protected]>
-
-Casey Detrio <[email protected]>
+Sven Ehlert <[email protected]>
 
-Cheng Li <lob4tt@gmail.com>
+Vitalik Buterin <v@buterin.com>
 
-Chris Ziogas <[email protected]>
-Chris Ziogas <[email protected]> <[email protected]>
+Marian Oancea <[email protected]>
 
 Christoph Jentzsch <[email protected]>
 
-Diederik Loerakker <[email protected]>
-
-Dimitry Khokhlov <[email protected]>
-
-Domino Valdano <[email protected]>
-Domino Valdano <[email protected]> <[email protected]>
-
-Edgar Aroutiounian <[email protected]>
-
-Elliot Shepherd <[email protected]>
-
-Enrique Fynn <[email protected]>
-
-Enrique Fynn <[email protected]>
-Enrique Fynn <[email protected]> <[email protected]>
-
-Ernesto del Toro <[email protected]>
-Ernesto del Toro <[email protected]> <[email protected]>
-
-Everton Fraga <[email protected]>
-
-Felix Lange <[email protected]>
-Felix Lange <[email protected]> <[email protected]>
+Heiko Hees <[email protected]>
 
-Frank Wang <[email protected]>
+Alex Leverington <[email protected]>
+Alex Leverington <[email protected]> <[email protected]>
 
-Gary Rong <garyrong0905@gmail.com>
+Zsolt Felföldi <zsfelfoldi@gmail.com>
 
 Gavin Wood <[email protected]>
 
-Gregg Dourgarian <[email protected]>
-
-Guillaume Ballet <[email protected]>
-Guillaume Ballet <[email protected]> <[email protected]>
-
-Guillaume Nicolas <[email protected]>
+Martin Becze <[email protected]>
+Martin Becze <[email protected]> <[email protected]>
 
-Hanjiang Yu <[email protected]>
-Hanjiang Yu <[email protected]> <[email protected]>
+Dimitry Khokhlov <[email protected]>
 
-Heiko Hees <[email protected]>
+Roman Mandeleil <[email protected]>
 
-Henning Diedrich <[email protected]>
-Henning Diedrich <[email protected]> Drake Burroughs <[email protected]>
+Alec Perseghin <[email protected]>
 
-Hwanjo Heo <[email protected].com>
+Alon Muroch <alonmuroch@gmail.com>
 
-Iskander (Alex) Sharipov <[email protected]>
-Iskander (Alex) Sharipov <[email protected]> <[email protected]>
+Arkadiy Paronyan <[email protected]>
 
 Jae Kwon <[email protected]>
 
-Janoš Guljaš <[email protected]> <[email protected]>
-Janoš Guljaš <[email protected]> Janos Guljas <[email protected]>
+Aaron Kumavis <[email protected]>
 
-Jared Wasinger <j-wasinger@hotmail.com>
+Nick Dodson <silentcicero@outlook.com>
 
 Jason Carver <[email protected]>
 Jason Carver <[email protected]> <[email protected]>
 
-Javier Peletier <[email protected]>
-Javier Peletier <[email protected]> <[email protected]>
-
-Jeffrey Wilcke <[email protected]>
-Jeffrey Wilcke <[email protected]> <[email protected]>
-Jeffrey Wilcke <[email protected]> <[email protected]>
-Jeffrey Wilcke <[email protected]> <[email protected]>
-
-Jens Agerberg <[email protected]>
-
 Joseph Chow <[email protected]>
 Joseph Chow <[email protected]> ethers <TODO>
 
+Enrique Fynn <[email protected]>
 
-Joseph Goulden <[email protected]>
-
-Justin Drake <[email protected]>
-
-Kenso Trabing <[email protected]>
-Kenso Trabing <[email protected]> <[email protected]>
-
-Liang Ma <[email protected]>
-Liang Ma <[email protected]> <[email protected]>
+Vincent G <[email protected]>
 
-Louis Holbrook <[email protected]>
-Louis Holbrook <[email protected]> <[email protected].com>
+RJ Catalano <[email protected]>
+RJ Catalano <[email protected]> <rj@erisindustries.com>
 
-Maran Hidskes <maran.hidskes@gmail.com>
+Nchinda Nchinda <nchinda2@gmail.com>
 
-Marian Oancea <[email protected]>
+Aron Fischer <[email protected]> <[email protected]>
 
-Martin Becze <[email protected]>
-Martin Becze <[email protected]> <[email protected]>
+Vlad Gluhovsky <[email protected]>
 
-Martin Lundfall <[email protected]>
+Ville Sundell <[email protected]>
 
-Matt Garnett <[email protected].com>
+Elliot Shepherd <elliot@identitii.com>
 
-Matthew Halpern <[email protected]>
-Matthew Halpern <[email protected]> <[email protected]>
+Yohann Léon <[email protected]>
 
-Michael Riabzev <[email protected]>
+Gregg Dourgarian <[email protected]>
 
-Nchinda Nchinda <nchinda2@gmail.com>
+Casey Detrio <cdetrio@gmail.com>
 
-Nick Dodson <[email protected]>
+Jens Agerberg <[email protected]>
 
 Nick Johnson <[email protected]>
 
-Nick Savers <[email protected]>
+Henning Diedrich <[email protected]>
+Henning Diedrich <[email protected]> Drake Burroughs <[email protected]>
 
-Nishant Das <nishdas93@gmail.com>
-Nishant Das <nishdas93@gmail.com> <nish1993@hotmail.com>
+Felix Lange <fjl@twurst.com>
+Felix Lange <fjl@twurst.com> <[email protected].com>
 
-Olivier Hervieu <olivier.hervieu@gmail.com>
+Максим Чусовлянов <mchusovlianov@gmail.com>
 
-Pascal Dierich <[email protected]>
-Pascal Dierich <[email protected]> <pascal@pascaldierich.com>
+Louis Holbrook <[email protected]>
+Louis Holbrook <[email protected]> <[email protected].com>
 
-RJ Catalano <[email protected]>
-RJ Catalano <[email protected]> <[email protected]>
+Thomas Bocek <[email protected]>
 
-Ralph Caraveo <deckarep@gmail.com>
+Victor Tran <vu.tran54@gmail.com>
 
-Rene Lubov <[email protected].com>
+Justin Drake <drakefjustin@gmail.com>
 
-Robert Zaremba <[email protected]>
-Robert Zaremba <[email protected]> <[email protected]>
+Frank Wang <[email protected]>
 
-Roman Mandeleil <[email protected]>
+Gary Rong <[email protected]>
+
+Guillaume Nicolas <[email protected]>
 
 Sorin Neacsu <[email protected]>
 Sorin Neacsu <[email protected]> <[email protected]>
 
-Sven Ehlert <[email protected]>
-
-Taylor Gerring <[email protected]>
-Taylor Gerring <[email protected]> <[email protected]>
-
-Thomas Bocek <[email protected]>
-
-Tim Cooijmans <[email protected]>
-
 Valentin Wüstholz <[email protected]>
 Valentin Wüstholz <[email protected]> <[email protected]>
 
-Victor Tran <[email protected]>
-
-Viktor Trón <[email protected]>
-
-Ville Sundell <[email protected]>
-
-Vincent G <[email protected]>
-
-Vitalik Buterin <[email protected]>
-
-Vlad Gluhovsky <[email protected]>
-Vlad Gluhovsky <[email protected]> <[email protected]>
-
-Wenshao Zhong <[email protected]>
-Wenshao Zhong <[email protected]> <[email protected]>
-Wenshao Zhong <[email protected]> <[email protected]>
-
-Will Villanueva <[email protected]>
-
-Xiaobing Jiang <[email protected]>
-
-Xudong Liu <[email protected]>
-
-Yohann Léon <[email protected]>
-
-Zachinquarantine <[email protected]>
-Zachinquarantine <[email protected]> <[email protected]>
-
-Ziyuan Zhong <[email protected]>
-
-Zsolt Felföldi <[email protected]>
-
-meowsbits <[email protected]>
-meowsbits <[email protected]> <[email protected]>
-
-nedifi <[email protected]>
+Armin Braun <[email protected]>
 
-Максим Чусовлянов <[email protected]>
+Ernesto del Toro <[email protected]>
+Ernesto del Toro <[email protected]> <[email protected]>