Merge pull request ethereum#121 from OffchainLabs/merge-geth-1.10.19

Merge in upstream geth 1.10.19

.github/CODEOWNERS

@@ -10,11 +10,12 @@ consensus                       @karalabe
 core/                           @karalabe @holiman @rjl493456442
 eth/                            @karalabe @holiman @rjl493456442
 eth/catalyst/                   @gballet
-graphql/                        @gballet
+eth/tracers/                    @s1na
+graphql/                        @gballet @s1na
 les/                            @zsfelfoldi @rjl493456442
 light/                          @zsfelfoldi @rjl493456442
 mobile/                         @karalabe @ligi
-node/                           @fjl @renaynay
+node/                           @fjl
 p2p/                            @fjl @zsfelfoldi
 rpc/                            @fjl @holiman
 p2p/simulations                 @fjl

.golangci.yml

@@ -19,32 +19,53 @@ linters:
     - govet
     - ineffassign
     - misspell
-    # - staticcheck
     - unconvert
-    # - unused
     - varcheck
+    - typecheck
+    - unused
+    - staticcheck
+    - bidichk
+    - durationcheck
+    - exportloopref
+    - gosec
+
+    #- structcheck # lots of false positives
+    #- errcheck #lot of false positives
+   # - contextcheck
+   # - errchkjson # lots of false positives
+   # - errorlint # this check crashes
+   # - exhaustive # silly check
+   # - makezero # false positives
+   # - nilerr # several intentional
 
 linters-settings:
   gofmt:
     simplify: true
   goconst:
     min-len: 3 # minimum length of string constant
     min-occurrences: 6 # minimum number of occurrences
+  gosec:
+    excludes:
+     - G404 # Use of weak random number generator - lots of FP
+     - G107 # Potential http request -- those are intentional
+     - G306 # G306: Expect WriteFile permissions to be 0600 or less
 
 issues:
   exclude-rules:
-    - path: crypto/blake2b/
-      linters:
-        - deadcode
-    - path: crypto/bn256/cloudflare
-      linters:
-        - deadcode
-    - path: p2p/discv5/
-      linters:
-        - deadcode
-    - path: core/vm/instructions_test.go
-      linters:
-        - goconst
-    - path: cmd/faucet/
+    - path: crypto/bn256/cloudflare/optate.go
       linters:
         - deadcode
+        - staticcheck
+    - path: internal/build/pgp.go
+      text: 'SA1019: package golang.org/x/crypto/openpgp is deprecated'
+    - path: core/vm/contracts.go
+      text: 'SA1019: package golang.org/x/crypto/ripemd160 is deprecated'
+    - path: accounts/usbwallet/trezor.go
+      text: 'SA1019: package github.com/golang/protobuf/proto is deprecated'
+    - path: accounts/usbwallet/trezor/
+      text: 'SA1019: package github.com/golang/protobuf/proto is deprecated'
+  exclude:
+    - 'SA1019: event.TypeMux is deprecated: use Feed'
+    - 'SA1019: strings.Title is deprecated'
+    - 'SA1029: should not use built-in type string as key for value'
+    - 'G306: Expect WriteFile permissions to be 0600 or less'

.mailmap

@@ -1,123 +1,237 @@
-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>
+Aaron Buchwald <aaron.buchwald56@gmail.com>
 
-Viktor Trón <viktor.tron@gmail.com>
+Aaron Kumavis <kumavis@users.noreply.github.com>
 
-Joseph Goulden <joegoulden@gmail.com>
+Abel Nieto <abel.nieto90@gmail.com>
+Abel Nieto <abel.nieto90@gmail.com> <anietoro@uwaterloo.ca>
 
-Nick Savers <nicksavers@gmail.com>
+Afri Schoedon <58883403+q9f@users.noreply.github.com>
+Afri Schoedon <5chdn@users.noreply.github.com> <58883403+q9f@users.noreply.github.com>
 
-Maran Hidskes <maran.hidskes@gmail.com>
+Alec Perseghin <aperseghin@gmail.com>
 
-Taylor Gerring <taylor.gerring@gmail.com>
-Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>
+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>
+
+Andrey Petrov <shazow@gmail.com>
+Andrey Petrov <shazow@gmail.com> <andrey.petrov@shazow.net>
+
+Arkadiy Paronyan <arkadiy@ethdev.com>
+
+Armin Braun <me@obrown.io>
+
+Aron Fischer <github@aron.guru> <homotopycolimit@users.noreply.github.com>
+
+Austin Roberts <code@ausiv.com>
+Austin Roberts <code@ausiv.com> <git@ausiv.com>
 
 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>
 
-Sven Ehlert <sven@ethdev.com>
+Boqin Qin <bobbqqin@bupt.edu.cn>
+Boqin Qin <bobbqqin@bupt.edu.cn> <Bobbqqin@gmail.com>
 
-Vitalik Buterin <v@buterin.com>
+Casey Detrio <cdetrio@gmail.com>
 
-Marian Oancea <contact@siteshop.ro>
+Cheng Li <lob4tt@gmail.com>
+
+Chris Ziogas <ziogaschr@gmail.com>
+Chris Ziogas <ziogaschr@gmail.com> <ziogas_chr@hotmail.com>
 
 Christoph Jentzsch <jentzsch.software@gmail.com>
 
-Heiko Hees <heiko@heiko.org>
+Diederik Loerakker <proto@protolambda.com>
 
-Alex Leverington <alex@ethdev.com>
-Alex Leverington <alex@ethdev.com> <subtly@users.noreply.github.com>
+Dimitry Khokhlov <winsvega@mail.ru>
 
-Zsolt Felföldi <zsfelfoldi@gmail.com>
+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>
+
+Frank Wang <eternnoir@gmail.com>
+
+Gary Rong <garyrong0905@gmail.com>
 
 Gavin Wood <i@gavwood.com>
 
-Martin Becze <mjbecze@gmail.com>
-Martin Becze <mjbecze@gmail.com> <wanderer@users.noreply.github.com>
+Gregg Dourgarian <greggd@tempworks.com>
 
-Dimitry Khokhlov <winsvega@mail.ru>
+Guillaume Ballet <gballet@gmail.com>
+Guillaume Ballet <gballet@gmail.com> <3272758+gballet@users.noreply.github.com>
 
-Roman Mandeleil <roman.mandeleil@gmail.com>
+Guillaume Nicolas <guin56@gmail.com>
 
-Alec Perseghin <aperseghin@gmail.com>
+Hanjiang Yu <delacroix.yu@gmail.com>
+Hanjiang Yu <delacroix.yu@gmail.com> <42531996+de1acr0ix@users.noreply.github.com>
 
-Alon Muroch <alonmuroch@gmail.com>
+Heiko Hees <heiko@heiko.org>
 
-Arkadiy Paronyan <arkadiy@ethdev.com>
+Henning Diedrich <hd@eonblast.com>
+Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>
+
+Hwanjo Heo <34005989+hwanjo@users.noreply.github.com>
+
+Iskander (Alex) Sharipov <quasilyte@gmail.com>
+Iskander (Alex) Sharipov <quasilyte@gmail.com> <i.sharipov@corp.vk.com>
 
 Jae Kwon <jkwon.work@gmail.com>
 
-Aaron Kumavis <kumavis@users.noreply.github.com>
+Janoš Guljaš <janos@resenje.org> <janos@users.noreply.github.com>
+Janoš Guljaš <janos@resenje.org> Janos Guljas <janos@resenje.org>
 
-Nick Dodson <silentcicero@outlook.com>
+Jared Wasinger <j-wasinger@hotmail.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>
 
-Vincent G <caktux@gmail.com>
+Joseph Goulden <joegoulden@gmail.com>
 
-RJ Catalano <catalanor0220@gmail.com>
-RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com>
+Justin Drake <drakefjustin@gmail.com>
 
-Nchinda Nchinda <nchinda2@gmail.com>
+Kenso Trabing <ktrabing@acm.org>
+Kenso Trabing <ktrabing@acm.org> <kenso.trabing@bloomwebsite.com>
 
-Aron Fischer <github@aron.guru> <homotopycolimit@users.noreply.github.com>
+Liang Ma <liangma@liangbit.com>
+Liang Ma <liangma@liangbit.com> <liangma.ul@gmail.com>
 
-Vlad Gluhovsky <gluk256@users.noreply.github.com>
+Louis Holbrook <dev@holbrook.no>
+Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com>
 
-Ville Sundell <github@solarius.fi>
+Maran Hidskes <maran.hidskes@gmail.com>
 
-Elliot Shepherd <elliot@identitii.com>
+Marian Oancea <contact@siteshop.ro>
 
-Yohann Léon <sybiload@gmail.com>
+Martin Becze <mjbecze@gmail.com>
+Martin Becze <mjbecze@gmail.com> <wanderer@users.noreply.github.com>
 
-Gregg Dourgarian <greggd@tempworks.com>
+Martin Lundfall <martin.lundfall@protonmail.com>
 
-Casey Detrio <cdetrio@gmail.com>
+Matt Garnett <14004106+lightclient@users.noreply.github.com>
 
-Jens Agerberg <github@agerberg.me>
+Matthew Halpern <matthalp@gmail.com>
+Matthew Halpern <matthalp@gmail.com> <matthalp@google.com>
 
-Nick Johnson <arachnid@notdot.net>
+Michael Riabzev <michael@starkware.co>
 
-Henning Diedrich <hd@eonblast.com>
-Henning Diedrich <hd@eonblast.com> Drake Burroughs <wildfyre@hotmail.com>
+Nchinda Nchinda <nchinda2@gmail.com>
 
-Felix Lange <fjl@twurst.com>
-Felix Lange <fjl@twurst.com> <fjl@users.noreply.github.com>
+Nick Dodson <silentcicero@outlook.com>
 
-Максим Чусовлянов <mchusovlianov@gmail.com>
+Nick Johnson <arachnid@notdot.net>
 
-Louis Holbrook <dev@holbrook.no>
-Louis Holbrook <dev@holbrook.no> <nolash@users.noreply.github.com>
+Nick Savers <nicksavers@gmail.com>
 
-Thomas Bocek <tom@tomp2p.net>
+Nishant Das <nishdas93@gmail.com>
+Nishant Das <nishdas93@gmail.com> <nish1993@hotmail.com>
 
-Victor Tran <vu.tran54@gmail.com>
+Olivier Hervieu <olivier.hervieu@gmail.com>
 
-Justin Drake <drakefjustin@gmail.com>
+Pascal Dierich <pascal@merkleplant.xyz>
+Pascal Dierich <pascal@merkleplant.xyz> <pascal@pascaldierich.com>
 
-Frank Wang <eternnoir@gmail.com>
+RJ Catalano <catalanor0220@gmail.com>
+RJ Catalano <catalanor0220@gmail.com> <rj@erisindustries.com>
 
-Gary Rong <garyrong0905@gmail.com>
+Ralph Caraveo <deckarep@gmail.com>
 
-Guillaume Nicolas <guin56@gmail.com>
+Rene Lubov <41963722+renaynay@users.noreply.github.com>
+
+Robert Zaremba <robert@zaremba.ch>
+Robert Zaremba <robert@zaremba.ch> <robert.zaremba@scale-it.pl>
+
+Roman Mandeleil <roman.mandeleil@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>
 
-Armin Braun <me@obrown.io>
+Victor Tran <vu.tran54@gmail.com>
 
-Ernesto del Toro <ernesto.deltoro@gmail.com>
-Ernesto del Toro <ernesto.deltoro@gmail.com> <ernestodeltoro@users.noreply.github.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>
+
+Максим Чусовлянов <mchusovlianov@gmail.com>