[Upgrade] Go-Ethereum release v1.9.25 #1223
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* crypto/cloudflare: fix nil deref in random G1/G2 reading * crypto/bn256: improve fuzzer * crypto/bn256: fix some flaws in fuzzer
* tests/fuzzers, common/bitutil: make fuzzers use correct returnvalues + remove output * tests/fuzzers/stacktrie: fix duplicate-key insertion in stacktrie (false positive) * tests/fuzzers/stacktrie: fix compilation error * tests/fuzzers: linter nits
* core/vm, protocol_params: implement eip-2565 modexp repricing * core/vm: fix review concerns
* all: core: split vm.Config into BlockConfig and TxConfig * core: core/vm: reset EVM between tx in block instead of creating new * core/vm: added docs
* consensus/ethash: only use *reflect.SliceHeader, not reflect.SliceHeader. See comment here: https://github.com/golang/go/issues/40397\#issuecomment-663748689 * consensus/ethash: pr feedback from @mdempsky, makes a copy of dest such that is not mutated * consensus/ethash: remove noop assign * consensus/ethash: apply same fix to another location Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se>
The z == 0 check is hit whenever we Add two points with the same x1/x2 coordinate. crypto/elliptic uses the same check in their affineFromJacobian function. This change does not affect block processing or tx signature verification in any way, because it does not use the Add or Double methods.
* cmd, core, eth, light, trie: disable recording preimage by default * core, eth: fix unit tests * core: fix import * all: change to nopreimage * cmd, core, eth, trie: use cache.preimages flag * cmd: enable preimages for archive node * cmd/utils, trie: simplify preimage tracking a bit * core: fix linter Co-authored-by: Péter Szilágyi <peterke@gmail.com>
cmd/geth: remove retesteth
* Only compare hostnames in ws.origins Also using a helper function for ToLower consolidates all preparation steps in one function for more maintainable consistency. Spaces => tabs Remove a semicolon Add space at start of comment Remove parens around conditional Handle case wehre parsed hostname is empty When passing a single word like "localhost" the parsed hostname is an empty string. Handle this and the error-parsing case together as default, and the nonempty hostname case in the conditional. Refactor with new originIsAllowed functions Adds originIsAllowed() & ruleAllowsOrigin(); removes prepOriginForComparison Remove blank line Added tests for simple allowed-orign rule which does not specify a protocol or port, just a hostname Fix copy-paste: `:=` => `=` Remove parens around conditional Remove autoadded whitespace on blank lines Compare scheme, hostname, and port with rule if the rule specifies those portions. Remove one autoadded trailing whitespace Better handle case where only origin host is given e.g. "localhost" Remove parens around conditional Refactor: attemptWebsocketConnectionFromOrigin DRY Include return type on helper function Provide srv obj in helper fn Provide srv to helper fn Remove stray underscore Remove blank line parent 93e666b4c1e7e49b8406dc83ed93f4a02ea49ac1 author wbt <wbt@users.noreply.github.com> 1598559718 -0400 committer Martin Holst Swende <martin@swende.se> 1605602257 +0100 gpgsig -----BEGIN PGP SIGNATURE----- iQFFBAABCAAvFiEEypmrtbNuJK1doP1AaDtDjAWl3fAFAl+zi9ARHG1hcnRpbkBz d2VuZGUuc2UACgkQaDtDjAWl3fDRiwgAoMtzU8dwRV7Q9xkCwWEx9Wz2f3n6jUr2 VWBycDKGKwRkPPOER3oc9kzjGU/P1tFlK07PjfnAKZ9KWzxpDcJZwYM3xCBurG7A 16y4YsQnzgPNONv3xIkdi3RZtDBIiPFFEmdZFFvZ/jKexfI6JIYPngCAoqdTIFb9 On/aPvvVWQn1ExfmarsvvJ7kUDUG77tZipuacEH5FfFsfelBWOEYPe+I9ToUHskv +qO6rOkV1Ojk8eBc6o0R1PnApwCAlEhJs7aM/SEOg4B4ZJJneiFuEXBIG9+0yS2I NOicuDPLGucOB5nBsfIKI3USPeE+3jxdT8go2lN5Nrhm6MimoILDsQ== =sgUp -----END PGP SIGNATURE----- Refactor: drop err var for more concise test lines Add several tests for new WebSocket origin checks Remove autoadded whitespace on blank lines Restore TestWebsocketOrigins originally-named test and rename the others to be helpers rather than full tests Remove autoadded whitespace on blank line Temporarily comment out new test sets Uncomment test around origin rule with scheme Remove tests without scheme on browser origin per https://github.com/ethereum/go-ethereum/pull/21481/files#r479371498 Uncomment tests with port; remove some blank lines Handle when browser does not specify scheme/port Uncomment test for including scheme & port in rule Add IP tests * node: more tests + table-driven, ws origin changes Co-authored-by: Martin Holst Swende <martin@swende.se>
…s (#21871) * trie: fix tests to work on 32-bit systems * les: make test work on 32-bit platform * cmd/geth: fix windows-issues on tests * trie: improve balance * cmd/geth: make account tests less verbose + less mem intense * rpc: make debug-level log output less verbose * cmd/geth: lint
* crypto/bn256: fix bn256Mul fuzzer to not hang on large input * Update crypto/bn256/bn256_fuzz.go Co-authored-by: ligi <ligi@ligi.de> Co-authored-by: ligi <ligi@ligi.de>
* p2p: avoid busy-loop on temporary errors * p2p: address review concerns
Also fixes a bug in les/flowcontrol that caused the overflow.
closes #20024
* added bls fuzzer * crypto/bls12381: revert bls-changes, fixup fuzzer tests * fuzzers: split bls fuzzing into 8 different units * fuzzers/bls: remove (now stale) corpus * crypto/bls12381: added blsfuzz corpus * fuzzers/bls12381: fix the bls corpus * fuzzers: fix oss-fuzz script * tests/fuzzers: fixups on bls corpus * test/fuzzers: remove leftover corpus Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
github: Add new style of issue-templates
Resolves #21532 Co-authored-by: roger <dengjun@huobi.com>
This type is automatically offered by github after changing to the new style and a security.md being present
* cmd/devp2p/internal/ethtest: added large announcement tests * cmd/devp2p/internal/ethtest: added large announcement tests * cmd/devp2p/internal/ethtest: refactored stuff a bit * cmd/devp2p/internal/ethtest: added TestMaliciousStatus/Handshake * cmd/devp2p/internal/ethtest: fixed rebasing issue * happy linter, happy life * cmd/devp2p/internal/ethtest: used readAndServe * stuff * cmd/devp2p/internal/ethtest: fixed test cases
…atement (#21854)
Changes:
Simplify nested complexity
If an if blocks ends with a return statement then remove the else nesting.
Most of the changes has also been reported in golint https://goreportcard.com/report/github.com/ethereum/go-ethereum#golint
baptiste-b-pegasys
previously approved these changes
Aug 30, 2021
ricardolyn
reviewed
Aug 30, 2021
in state_processor to be aligned with geth
nmvalera
reviewed
Aug 31, 2021
but pass a non nil value
ricardolyn
approved these changes
Sep 2, 2021
baptiste-b-pegasys
deleted the
upgrade/go-ethereum/v1.9.25-2021629165723
branch
danielporto
pushed a commit
to danielporto/quorum
that referenced
this pull request
Sep 7, 2021
* params: begin v1.9.25 release cycle * crypto/bn256: improve bn256 fuzzer (#21815) * crypto/cloudflare: fix nil deref in random G1/G2 reading * crypto/bn256: improve fuzzer * crypto/bn256: fix some flaws in fuzzer * crypto/bn256: better comments for u, P and Order (#21836) * tests/fuzzers: improve the fuzzers (#21829) * tests/fuzzers, common/bitutil: make fuzzers use correct returnvalues + remove output * tests/fuzzers/stacktrie: fix duplicate-key insertion in stacktrie (false positive) * tests/fuzzers/stacktrie: fix compilation error * tests/fuzzers: linter nits * core/vm, protocol_params: implement eip-2565 modexp repricing (#21607) * core/vm, protocol_params: implement eip-2565 modexp repricing * core/vm: fix review concerns * core, all: split vm.Context into BlockContext and TxContext (#21672) * all: core: split vm.Config into BlockConfig and TxConfig * core: core/vm: reset EVM between tx in block instead of creating new * core/vm: added docs * accounts/abi: template: set events Raw field in Parse methods (#21807) * common: fix documentation of Address.SetBytes (#21814) * crypto/bn256: refine comments according to #19577, #21595, and #21836 (#21847) * consensus/ethash: fix usage of *reflect.SliceHeader (#21372) * consensus/ethash: only use *reflect.SliceHeader, not reflect.SliceHeader. See comment here: https://github.com/golang/go/issues/40397\#issuecomment-663748689 * consensus/ethash: pr feedback from @mdempsky, makes a copy of dest such that is not mutated * consensus/ethash: remove noop assign * consensus/ethash: apply same fix to another location Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd/geth: remove retesteth * crypto/secp256k1: add checking z sign in affineFromJacobian (#18419) The z == 0 check is hit whenever we Add two points with the same x1/x2 coordinate. crypto/elliptic uses the same check in their affineFromJacobian function. This change does not affect block processing or tx signature verification in any way, because it does not use the Add or Double methods. * cmd/geth: improve les test on windows (#21860) * all: disable recording preimage of trie keys (#21402) * cmd, core, eth, light, trie: disable recording preimage by default * core, eth: fix unit tests * core: fix import * all: change to nopreimage * cmd, core, eth, trie: use cache.preimages flag * cmd: enable preimages for archive node * cmd/utils, trie: simplify preimage tracking a bit * core: fix linter Co-authored-by: Péter Szilágyi <peterke@gmail.com> * metrics: fix the panic for reading empty cpu stats (#21864) * node: support expressive origin rules in ws.origins (#21481) * Only compare hostnames in ws.origins Also using a helper function for ToLower consolidates all preparation steps in one function for more maintainable consistency. Spaces => tabs Remove a semicolon Add space at start of comment Remove parens around conditional Handle case wehre parsed hostname is empty When passing a single word like "localhost" the parsed hostname is an empty string. Handle this and the error-parsing case together as default, and the nonempty hostname case in the conditional. Refactor with new originIsAllowed functions Adds originIsAllowed() & ruleAllowsOrigin(); removes prepOriginForComparison Remove blank line Added tests for simple allowed-orign rule which does not specify a protocol or port, just a hostname Fix copy-paste: `:=` => `=` Remove parens around conditional Remove autoadded whitespace on blank lines Compare scheme, hostname, and port with rule if the rule specifies those portions. Remove one autoadded trailing whitespace Better handle case where only origin host is given e.g. "localhost" Remove parens around conditional Refactor: attemptWebsocketConnectionFromOrigin DRY Include return type on helper function Provide srv obj in helper fn Provide srv to helper fn Remove stray underscore Remove blank line parent 93e666b4c1e7e49b8406dc83ed93f4a02ea49ac1 author wbt <wbt@users.noreply.github.com> 1598559718 -0400 committer Martin Holst Swende <martin@swende.se> 1605602257 +0100 gpgsig -----BEGIN PGP SIGNATURE----- iQFFBAABCAAvFiEEypmrtbNuJK1doP1AaDtDjAWl3fAFAl+zi9ARHG1hcnRpbkBz d2VuZGUuc2UACgkQaDtDjAWl3fDRiwgAoMtzU8dwRV7Q9xkCwWEx9Wz2f3n6jUr2 VWBycDKGKwRkPPOER3oc9kzjGU/P1tFlK07PjfnAKZ9KWzxpDcJZwYM3xCBurG7A 16y4YsQnzgPNONv3xIkdi3RZtDBIiPFFEmdZFFvZ/jKexfI6JIYPngCAoqdTIFb9 On/aPvvVWQn1ExfmarsvvJ7kUDUG77tZipuacEH5FfFsfelBWOEYPe+I9ToUHskv +qO6rOkV1Ojk8eBc6o0R1PnApwCAlEhJs7aM/SEOg4B4ZJJneiFuEXBIG9+0yS2I NOicuDPLGucOB5nBsfIKI3USPeE+3jxdT8go2lN5Nrhm6MimoILDsQ== =sgUp -----END PGP SIGNATURE----- Refactor: drop err var for more concise test lines Add several tests for new WebSocket origin checks Remove autoadded whitespace on blank lines Restore TestWebsocketOrigins originally-named test and rename the others to be helpers rather than full tests Remove autoadded whitespace on blank line Temporarily comment out new test sets Uncomment test around origin rule with scheme Remove tests without scheme on browser origin per https://github.com/ethereum/go-ethereum/pull/21481/files#r479371498 Uncomment tests with port; remove some blank lines Handle when browser does not specify scheme/port Uncomment test for including scheme & port in rule Add IP tests * node: more tests + table-driven, ws origin changes Co-authored-by: Martin Holst Swende <martin@swende.se> * trie, rpc, cmd/geth: fix tests on 32-bit and windows + minor rpc fixes (#21871) * trie: fix tests to work on 32-bit systems * les: make test work on 32-bit platform * cmd/geth: fix windows-issues on tests * trie: improve balance * cmd/geth: make account tests less verbose + less mem intense * rpc: make debug-level log output less verbose * cmd/geth: lint * crypto/bn256: fix bn256Mul fuzzer to not hang on large input (#21872) * crypto/bn256: fix bn256Mul fuzzer to not hang on large input * Update crypto/bn256/bn256_fuzz.go Co-authored-by: ligi <ligi@ligi.de> Co-authored-by: ligi <ligi@ligi.de> * p2p: avoid spinning loop on out-of-handles (#21878) * p2p: avoid busy-loop on temporary errors * p2p: address review concerns * les/utils: protect against WeightedRandomSelect overflow (#21839) Also fixes a bug in les/flowcontrol that caused the overflow. * github: Add new style of issue-templates closes #20024 * tests/fuzzers/bls1381: add bls fuzzer (#21796) * added bls fuzzer * crypto/bls12381: revert bls-changes, fixup fuzzer tests * fuzzers: split bls fuzzing into 8 different units * fuzzers/bls: remove (now stale) corpus * crypto/bls12381: added blsfuzz corpus * fuzzers/bls12381: fix the bls corpus * fuzzers: fix oss-fuzz script * tests/fuzzers: fixups on bls corpus * test/fuzzers: remove leftover corpus Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * cmd/faucet: improve handling of facebook post url (#21838) Resolves #21532 Co-authored-by: roger <dengjun@huobi.com> * les: fix GetProofsV2 bug (#21896) * github: Remove vulnerability.md (#21894) This type is automatically offered by github after changing to the new style and a security.md being present * cmd/devp2p/internal/ethtest: add 'large announcement' tests (#21792) * cmd/devp2p/internal/ethtest: added large announcement tests * cmd/devp2p/internal/ethtest: added large announcement tests * cmd/devp2p/internal/ethtest: refactored stuff a bit * cmd/devp2p/internal/ethtest: added TestMaliciousStatus/Handshake * cmd/devp2p/internal/ethtest: fixed rebasing issue * happy linter, happy life * cmd/devp2p/internal/ethtest: used readAndServe * stuff * cmd/devp2p/internal/ethtest: fixed test cases * core/types: fixed typo (#21897) * all: simplify nested complexity and if blocks ending with a return statement (#21854) Changes: Simplify nested complexity If an if blocks ends with a return statement then remove the else nesting. Most of the changes has also been reported in golint https://goreportcard.com/report/github.com/ethereum/go-ethereum#golint * graphql: always return 400 if errors are present in the response (#21882) * Make sure to return 400 when errors are present in the response * graphql: use less memory in chainconfig for tests Co-authored-by: Martin Holst Swende <martin@swende.se> * all: remove redundant conversions and import names (#21903) * p2p/discover: fix deadlock in discv5 message dispatch (#21858) This fixes a deadlock that could occur when a response packet arrived after a call had already received enough responses and was about to signal completion to the dispatch loop. Co-authored-by: Felix Lange <fjl@twurst.com> * crypto: signing builds with signify/minisign (#21798) * internal/build: implement signify's signing func * Add signify to the ci utility * fix output file format * Add unit test for signify * holiman's + travis' feedback * internal/build: verify signify's output * crypto: move signify to common dir * use go-minisign to verify binaries * more holiman feedback * crypto, ci: support minisign output * only accept one-line trusted comments * configurable untrusted comments * code cleanup in tests * revert to use ed25519 from the stdlib * bug: fix for empty untrusted comments * write timestamp as comment if trusted comment isn't present * rename line checker to commentHasManyLines * crypto: added signify fuzzer (Consensys#6) * crypto: added signify fuzzer * stuff * crypto: updated signify fuzzer to fuzz comments * crypto: repro signify crashes * rebased fuzzer on build-signify branch * hide fuzzer behind gofuzz build flag * extract key data inside a single function * don't treat \r as a newline * travis: fix signing command line * do not use an external binary in tests * crypto: move signify to crypto/signify * travis: fix formatting issue * ci: fix linter build after package move Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * accounts, signer: fix Ledger Live account derivation path (clef) (#21757) * signer/core/api: fix derivation of ledger live accounts For ledger hardware wallets, change account iteration as follows: - ledger legacy: m/44'/60'/0'/X; for 0<=X<5 - ledger live: m/44'/60'/0'/0/X; for 0<=X<5 - ledger legacy: m/44'/60'/0'/X; for 0<=X<10 - ledger live: m/44'/60'/X'/0/0; for 0<=X<10 Non-ledger derivation is unchanged and remains as: - non-ledger: m/44'/60'/0'/0/X; for 0<=X<10 * signer/core/api: derive ten default paths for all hardware wallets, plus ten legacy and ten live paths for ledger wallets * signer/core/api: as .../0'/0/0 already included by default paths, do not include it again with ledger live paths * accounts, signer: implement path iterators for hd wallets Co-authored-by: Martin Holst Swende <martin@swende.se> * accounts/keystore: add missing function doc for SignText (#21914) Co-authored-by: Pascal Dierich <pascal@pascaldierich.com> * cmd/geth: make tests run quicker + use less memory and disk (#21919) * cmd/devp2p/internal/ethtest: add transaction tests (#21857) * p2p/nodestate: fix deadlock during shutdown of les server (#21927) This PR fixes a deadlock reported here: #21925 The cause is that many operations may be pending, but if the close happens, only one of them gets awoken and exits, the others remain waiting for a signal that never comes. * les: fix nodiscover option (#21906) * params: update CHTs (#21941) * eth: fix error in tracing if reexec is set (#21830) * eth: fix error in tracing if reexec is set * eth: change pointer embedding to value-embedding * go.mod: update github.com/golang/snappy(#21934) This updates the snappy library depency to include a fix for a Go 1.16 incompatibility issue. * cmd/devp2p: add node filter for snap + fix arg error (#21950) * core/vm/runtime: remove duplicated line (#21956) This line is duplicated, though it doesn't cause any issues. * core: improve contextual information on core errors (#21869) A lot of times when we hit 'core' errors, example: invalid tx, the information provided is insufficient. We miss several pieces of information: what account has nonce too high, and what transaction in that block was offending? This PR adds that information, using the new type of wrapped errors. It also adds a testcase which (partly) verifies the output from the errors. The first commit changes all usage of direct equality-checks on core errors, into using errors.Is. The second commit adds contextual information. This wraps most of the core errors with more information, and also wraps it one more time in stateprocessor, to further provide tx index and tx hash, if such a tx is encoutered in a block. The third commit uses the chainmaker to try to generate chains with such errors in them, thus triggering the errors and checking that the generated string meets expectations. * cmd/geth: implement vulnerability check (#21859) * cmd/geth: implement vulnerability check * cmd/geth: use minisign to verify vulnerability feed * cmd/geth: add the test too * cmd/geth: more minisig/signify testing * cmd/geth: support multiple pubfiles for signing * cmd/geth: add @holiman minisig pubkey * cmd/geth: polishes on vulnerability check * cmd/geth: fix ineffassign linter nit * cmd/geth: add CVE to version check struct * cmd/geth/testdata: add missing testfile * cmd/geth: add more keys to versionchecker * cmd/geth: support file:// URLs in version check * cmd/geth: improve key ID printing when signature check fails Co-authored-by: Felix Lange <fjl@twurst.com> * les: cosmetic rewrite of the arm64 float bug workaround (#21960) * les: revert arm float bug workaround to check go 1.15 * add traces to reproduce outside travis * simpler workaround * crypto/secp256k1: add workaround for go mod vendor (#21735) Go won't vendor C files if there are no Go files present in the directory. Workaround is to add dummy Go files. Fixes: #20232 * accounts/abi/bind: allow specifying signer on transactOpts (#21356) This commit enables users to specify which signer they want to use while creating their transactOpts. Previously all contract interactions used the homestead signer. Now a user can specify whether they want to sign with homestead or EIP155 and specify the chainID which adds another layer of security. Closes #16484 * common: improve printing of Hash and Address (#21834) Both Hash and Address have a String method, which returns the value as hex with 0x prefix. They also had a Format method which tried to print the value using printf of []byte. The way Format worked was at odds with String though, leading to a situation where fmt.Sprintf("%v", hash) returned the decimal notation and hash.String() returned a hex string. This commit makes it consistent again. Both types now support the %v, %s, %q format verbs for 0x-prefixed hex output. %x, %X creates unprefixed hex output. %d is also supported and returns the decimal notation "[1 2 3...]". For Address, the case of hex characters in %v, %s, %q output is determined using the EIP-55 checksum. Using %x, %X with Address disables checksumming. Co-authored-by: Felix Lange <fjl@twurst.com> * core,les: headerchain import in batches (#21471) * core: add test for headerchain inserts * core, light: write headerchains in batches * core: change to one callback per batch of inserted headers + review concerns * core: error-check on batch write * core: unexport writeHeaders * core: remove callback parameter in InsertHeaderChain The semantics of InsertHeaderChain are now much simpler: it is now an all-or-nothing operation. The new WriteStatus return value allows callers to check for the canonicality of the insertion. This change simplifies use of HeaderChain in package les, where the callback was previously used to post chain events. * core: skip some hashing when writing headers * core: less hashing in header validation * core: fix headerchain flaw regarding blacklisted hashes Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/geth: add test to verify regexps in version check (#21962) * crypto/signify, build: fix archive signing with signify (#21977) This fixes some issues in crypto/signify and makes release signing work. The archive signing step in ci.go used getenvBase64, which decodes the key data. This is incorrect here because crypto/signify already base64-decodes the key. * p2p/enode: avoid crashing for invalid IP (#21981) The database panicked for invalid IPs. This is usually no problem because all code paths leading to node DB access verify the IP, but it's dangerous because improper validation can turn this panic into a DoS vulnerability. The quick fix here is to just turn database accesses using invalid IP into a noop. This isn't great, but I'm planning to remove the node DB for discv5 long-term, so it should be fine to have this quick fix for half a year. Fixes #21849 * les, light: remove untrusted header retrieval in ODR (#21907) * les, light: remove untrusted header retrieval in ODR * les: polish * light: check the hash equality in odr * core, trie: speed up some tests with quadratic processing flaw (#21987) This commit fixes a flaw in two testcases, and brings down the exec-time from ~40s to ~8s for trie/TestIncompleteSync. The checkConsistency was performed over and over again on the complete set of nodes, not just the recently added, turning it into a quadratic runtime. * les: introduce forkID (#21974) * les: introduce forkID * les: address comment * build: upgrade to Go 1.15.6 (#21986) * params: go-ethereum v1.9.25 stable * fix: merge * fix: review GoQ versions * fix: GoQuorum signer * fix: state processor, missing err formatting * fix: restore tx GoQ modification * fix: work with eip155 & psm tests * fix: cmd geth tests * fix: format (lint) * fix: copy default value, don't erase it * fix: cache config -> trie Config * fix: unit test restored, check another error * refactor: remove unused parameters * fix: configure with default cache config * fix: merge of master * go 1.15.6 * fix: for review * revert: unnecessary change * fix: remove comment * fix: review of variable name * fix: use the ChainContext interface in state_processor to be aligned with geth * fix: null pointer * fix: don't check nil pointer but pass a non nil value Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Nicolas Feignon <nfeignon@gmail.com> Co-authored-by: Pascal Dierich <pascal@pascaldierich.com> Co-authored-by: Sad Pencil <sadpencil@outlook.com> Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Abd ar-Rahman Hamidi <bakhtiyor.h@gmail.com> Co-authored-by: gary rong <garyrong0905@gmail.com> Co-authored-by: wbt <wbt@users.noreply.github.com> Co-authored-by: ligi <ligi@ligi.de> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: LieutenantRoger <dijsky_2015@hotmail.com> Co-authored-by: roger <dengjun@huobi.com> Co-authored-by: Alex Prut <1648497+alexprut@users.noreply.github.com> Co-authored-by: Antoine Toulme <atoulme@users.noreply.github.com> Co-authored-by: Nishant Das <nishdas93@gmail.com> Co-authored-by: Guillaume Ballet <gballet@gmail.com> Co-authored-by: Kristofer Peterson <svenski123@users.noreply.github.com> Co-authored-by: Pascal Dierich <pascal@merkleplant.xyz> Co-authored-by: Chris Ziogas <ziogas_chr@hotmail.com> Co-authored-by: Steve Ruckdashel <steven.ruckdashel@optum.com> Co-authored-by: Li, Cheng <lob4tt@gmail.com> Co-authored-by: Baptiste Boussemart <baptiste.boussemart@consensys.net> Co-authored-by: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com> Co-authored-by: Ricardo Silva <1945557+ricardolyn@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TODO
Plan & Analyse
As you review, list extra changes and/or tests to be implemented to ensure compatibility with GoQuorum specific features.
Build & Test
masterinto this branchAdd any extra changes/tests as comments on this PR.
Pushon the stack, so I am afraid it's incompatible. Reset() function is marked to be used scarcely, but in fact it's been used widely. In conclusion I am not confident with this Geth modification.Go-Ethereum Release: Marljeh (v1.9.25)
Release notes
Geth v1.9.25 is a maintenance release.
Notable changes in this release:
geth version-check, which displays known security issues (#21859)--ws.originsflag now supports more expressive origin rules (#21481)--cache.preimagesflag (#21402)devp2p nodeset filtercommand can now find snap-enabled nodes (#21950)evm t8ntool, was released in Geth v1.9.16 (#21861)Bug fixes:
go mod vendorof go-ethereum should now work (#21735)reexecoption for tracing RPC methods no longer crashes the RPC handler (#21830)common.Hashandcommon.Addressnow print as hex when usingfmt.Println(#21834)Rawfield of parsed events is now set correctly (#21807)For a full rundown of the changes please consult the Geth 1.9.25 release milestone
As with all our previous releases, you can find the:
ethereum/client-go.Codebase changes assessment
Legend
File Stats: (A) Added, (M) Modified and (R) Removed
Line Stats: (A) Added and (R) Removed
Assessment:
56 Pull Requests
M/A/R
(files changed)
A/R
(lines changed)
crypto/bn256: improve bn256 fuzzercrypto/bn256(1)crypto/bn256/cloudflare(1)crypto/bn256/bn256_fuzz.go(234)crypto/bn256/cloudflare/bn256.go(4)crypto/bn256: better comments for u, P and Ordercrypto/bn256/google(1)crypto/bn256/google/constants.go(10)tests/fuzzers: improve the fuzzerstests/fuzzers/stacktrie(1)tests/fuzzers/txfetcher(1)common/bitutil(1)tests/fuzzers/keystore(1)tests/fuzzers/rlp(1)tests/fuzzers/txfetcher/txfetcher_fuzzer.go(44)tests/fuzzers/rlp/rlp_fuzzer.go(32)tests/fuzzers/stacktrie/trie_fuzzer.go(14)common/bitutil/compress_fuzz.go(12)tests/fuzzers/keystore/keystore-fuzzer.go(4)core/vm, protocol_params: implement eip-2565 modexp repricingcore/vm(2)core/vm/testdata/precompiles(1)params(1)core/vm/testdata/precompiles/modexp_eip2565.json(242)core/vm/contracts.go(160)core/vm/contracts_test.go(54)params/protocol_params.go(2)core, all: split vm.Context into BlockContext and TxContextcore/vm(5)core(4)eth/tracers(3)core/vm/runtime(2)eth(2)les(2)tests(2)cmd/evm/internal/t8ntool(1)light(1)accounts/abi/bind/backends(1)cmd/geth(1)eth/api_tracer.go(120)core/state_processor.go(96)core/vm/evm.go(82)eth/tracers/tracers_test.go(42)core/evm.go(32)accounts/abi: template: set events Raw field in Parse methodsaccounts/abi/bind(1)accounts/abi/bind/template.go(2)common: fix documentation of Address.SetBytescommon(1)common/types.go(4)crypto/bn256: refine comments according to #19577, #21595, and #21836crypto/bn256/google(2)crypto/bn256/cloudflare(1)crypto/bn256/cloudflare/bn256.go(18)crypto/bn256/google/bn256.go(10)crypto/bn256/google/constants.go(4)consensus/ethash: fix usage of *reflect.SliceHeaderconsensus/ethash(1)consensus/ethash/algorithm.go(40)crypto/secp256k1: add checking z sign in affineFromJacobiancrypto/secp256k1(1)crypto/secp256k1/curve.go(8)cmd/geth: fix les test on windowscmd/geth(1)cmd/geth/les_test.go(56)all: disable recording preimage of trie keyseth(5)trie(2)cmd/geth(2)core(2)core/state(2)light(1)cmd/utils(1)trie/database.go(162)cmd/utils/flags.go(30)core/blockchain.go(30)trie/secure_trie.go(22)core/state/database.go(20)metrics: fix the panic for reading empty cpu statsmetrics(1)metrics/cpu_enabled.go(8)cmd/geth: remove retestethcmd/geth(3)cmd/geth/retesteth.go(1836)cmd/geth/retesteth_copypaste.go(296)cmd/geth/main.go(4)node: support expressive origin rules in ws.originsrpc(1)node(1)node/rpcstack_test.go(250)rpc/websocket.go(130)trie, rpc, cmd/geth: fix tests on 32-bit and windows + minor rpc fixescmd/geth(3)rpc(1)trie(1)internal/cmdtest(1)node(1)trie/trie_test.go(114)cmd/geth/les_test.go(70)cmd/geth/accountcmd_test.go(58)internal/cmdtest/test_cmd.go(30)rpc/endpoints.go(28)crypto/bn256: fix bn256Mul fuzzer to not hang on large inputcrypto/bn256(1)crypto/bn256/bn256_fuzz.go(12)p2p: avoid spinning loop on out-of-handlesp2p(1)p2p/server.go(22)les/utils: protect against WeightedRandomSelect overflowles/utils(1)les/flowcontrol(1)les/utils/weighted_select.go(22)les/flowcontrol/control.go(8)tests/fuzzers/bls1381: add bls fuzzertests/fuzzers/bls12381/testdata(9)crypto/bls12381(1)oss-fuzz.sh(1)tests/fuzzers/bls12381(1)tests/fuzzers/bls12381/bls_fuzzer.go(202)oss-fuzz.sh(38)crypto/bls12381/fp_test.go(18)github: Add new style of issue-templates.github/ISSUE_TEMPLATE(4).github/ISSUE_TEMPLATE/feature.md(34).github/ISSUE_TEMPLATE/vulnerability.md(26).github/ISSUE_TEMPLATE/bug.md(24).github/ISSUE_TEMPLATE/question.md(18)cmd/faucet: improve handling of facebook post urlcmd/faucet(1)cmd/faucet/faucet.go(10)les: fix GetProofsV2 bugles(1)les/server_handler.go(12)github: Remove vulnerability.md.github/ISSUE_TEMPLATE(1).github/ISSUE_TEMPLATE/vulnerability.md(26)cmd/devp2p/internal/ethtest: add 'large announcement' testscmd/devp2p/internal/ethtest(3)cmd/devp2p/internal/ethtest/suite.go(430)cmd/devp2p/internal/ethtest/large.go(160)cmd/devp2p/internal/ethtest/types.go(46)core/types: fixed typocore/types(1)core/types/transaction.go(4)simplify nested complexity and if blocks ending with a return statementles(4)les/lespay/server(3)crypto/bls12381(2)rpc(1)p2p/nat(1)cmd/clef(1)cmd/utils(1)console(1)core(1)p2p/nodestate(1)p2p/simulations(1)rlp(1)trie(1)les/serverpool_test.go(78)cmd/utils/flags.go(38)console/bridge.go(34)les/benchmark.go(18)p2p/simulations/network.go(18)Make sure to return 400 when errors are present in the responsegraphql(2)graphql/graphql_test.go(104)graphql/service.go(72)all: remove redundant conversions and import namescmd/evm(4)core/vm(4)cmd/geth(3)eth/filters(2)accounts/abi(2)accounts/keystore(2)common/hexutil(1)consensus/ethash(1)eth/downloader(1)accounts/scwallet(1)cmd/devp2p(1)cmd/clef(1)cmd/utils(1)core/state(1)core(1)accounts(1)accounts/usbwallet(1)contracts/checkpointoracle(1)cmd/puppeth(1)core/vm/gas_table.go(16)core/vm/instructions.go(16)accounts/abi/reflect_test.go(8)cmd/puppeth/genesis.go(8)core/state/statedb.go(8)p2p/discover: fix deadlock in discv5 message dispatchp2p/discover(1)p2p/discover/v5_udp.go(34)crypto: signing builds with signify/minisigncrypto/signify(3)go.mod(1)go.sum(1).travis.yml(1)build(1)crypto/signify/signify_test.go(308)crypto/signify/signify_fuzz.go(296)crypto/signify/signify.go(236)build/ci.go(108).travis.yml(52)accounts, signer: fix Ledger Live account derivation path (clef)accounts(2)signer/core(1)signer/core/api.go(194)accounts/hd_test.go(78)accounts/hd.go(56)accounts/keystore: add missing function doc for SignTextaccounts/keystore(1)accounts/keystore/wallet.go(20)cmd/geth: make tests run quicker + use less memory and diskcmd/geth(5)cmd/geth/consolecmd_test.go(186)cmd/geth/accountcmd_test.go(118)cmd/geth/dao_test.go(8)cmd/geth/genesis_test.go(4)cmd/geth/les_test.go(4)cmd/devp2p/internal/ethtest: add transaction testscmd/devp2p/internal/ethtest/testdata(5)cmd/devp2p/internal/ethtest(4)cmd/devp2p/internal/ethtest/transaction.go(360)cmd/devp2p/internal/ethtest/types.go(90)cmd/devp2p/internal/ethtest/suite.go(76)cmd/devp2p/internal/ethtest/chain_test.go(4)cmd/devp2p/internal/ethtest/testdata/genesis.json(4)p2p/nodestate: fix deadlockp2p/nodestate(1)p2p/nodestate/nodestate.go(4)les: fix nodiscover optioneth(2)les(2)cmd/utils(1)eth/discovery.go(10)les/enr_entry.go(10)cmd/utils/flags.go(8)eth/backend.go(4)les/client.go(4)params: update CHTsparams(1)params/config.go(64)eth: fix error in tracing if reexec is seteth(1)eth/api_tracer.go(16)go.mod: update github.com/golang/snappygo.mod(1)go.sum(1)go.mod(4)go.sum(4)cmd/devp2p: add node filter for snap + fix arg errorcmd/devp2p(1)cmd/devp2p/nodesetcmd.go(38)core/vm/runtime: remove duplicate linecore/vm/runtime(1)core/vm/runtime/runtime.go(2)core: improve contextual information on core errorscore(5)accounts/abi/bind/backends(1)light(1)miner(1)core/state_processor_test.go(304)core/state_transition.go(42)miner/worker.go(20)core/state_processor.go(8)core/tx_pool_test.go(8)cmd/geth: implement vulnerability checkcmd/geth/testdata/vcheck(6)cmd/geth(4)cmd/geth/testdata/vcheck/minisig-sigs(3)cmd/geth/testdata/vcheck/sigs(3)cmd/geth/testdata/vcheck/signify-sigs(1)go.mod(1)go.sum(1)cmd/geth/version_check.go(338)cmd/geth/version_check_test.go(158)cmd/geth/testdata/vcheck/data2.json(124)cmd/geth/testdata/vcheck/data.json(122)cmd/geth/misccmd.go(54)les: cosmetic rewrite of the arm64 float bug workaroundles/utils(1)les/utils/expiredvalue.go(10)crypto/secp256k1: add workaround for go mod vendorcrypto/secp256k1(1)crypto/secp256k1/libsecp256k1/contrib(1)crypto/secp256k1/libsecp256k1(1)crypto/secp256k1/libsecp256k1/include(1)crypto/secp256k1/libsecp256k1/src(1)crypto/secp256k1/libsecp256k1/src/modules(1)crypto/secp256k1/libsecp256k1/src/modules/ecdh(1)crypto/secp256k1/libsecp256k1/src/modules/recovery(1)crypto/secp256k1/dummy.go(40)crypto/secp256k1/libsecp256k1/contrib/dummy.go(14)crypto/secp256k1/libsecp256k1/dummy.go(14)crypto/secp256k1/libsecp256k1/include/dummy.go(14)crypto/secp256k1/libsecp256k1/src/dummy.go(14)accounts/abi/bind: allow to specify signer on transactOptsaccounts/abi/bind(3)accounts/abi/bind/backends(2)les(2)contracts/checkpointoracle(1)mobile(1)accounts/abi/bind/auth.go(184)accounts/abi/bind/bind_test.go(68)accounts/abi/bind/backends/simulated_test.go(24)mobile/bind.go(24)les/sync_test.go(12)common: improve printing of Hash and Addresscommon(2)common/types_test.go(332)common/types.go(188)core,les: headerchain import in batchescore(3)light(1)core/headerchain.go(584)core/headerchain_test.go(230)light/lightchain.go(68)core/blockchain.go(16)cmd/geth: add test to verify regexps in version checkcmd/geth/testdata/vcheck(1)cmd/geth(1)cmd/geth/version_check_test.go(126)cmd/geth/testdata/vcheck/vulnerabilities.json(44)crypto/signify, build: fix archive signing with signifycrypto/signify(2).travis.yml(1)build(1)crypto/signify/signify.go(200).travis.yml(52)build/ci.go(28)crypto/signify/signify_test.go(16)p2p/enode: avoid crashing for invalid IPp2p/enode(1)p2p/enode/nodedb.go(56)les, light: remove untrusted header retrieval in ODRles(6)light(3)les/client_handler.go(124)les/odr_requests.go(104)light/odr_util.go(78)les/odr.go(44)light/odr.go(22)core, trie: speed up some tests with quadratic processing flawcore/state(1)trie(1)core/state/sync_test.go(60)trie/sync_test.go(14)les: introduce forkIDles(5)les/client_handler.go(56)les/peer.go(54)les/peer_test.go(46)les/server_handler.go(12)les/protocol.go(10)build: upgrade to Go 1.15.6build(2)build/checksums.txt(40)build/ci.go(4)229 Changed files
cmd/geth/retesteth.go#21672
core/headerchain.go#21854
cmd/devp2p/internal/ethtest/suite.go#21857
cmd/devp2p/internal/ethtest/transaction.gocmd/geth/version_check.gocommon/types_test.gocrypto/signify/signify_test.go#21798
core/state_processor_test.gocrypto/signify/signify_fuzz.gocmd/geth/retesteth_copypaste.gocmd/geth/version_check_test.go#21962
node/rpcstack_test.gocrypto/bn256/bn256_fuzz.go#21815
core/vm/testdata/precompiles/modexp_eip2565.jsoncore/headerchain_test.gotests/fuzzers/bls12381/bls_fuzzer.gocrypto/signify/signify.go#21798
signer/core/api.gocommon/types.go#21834
cmd/geth/consolecmd_test.goaccounts/abi/bind/auth.goles/client_handler.go#21974
trie/database.gocore/vm/contracts.gocmd/devp2p/internal/ethtest/large.goeth/api_tracer.go#21672
#21830
cmd/geth/testdata/vcheck/vulnerabilities.jsoncmd/devp2p/internal/ethtest/types.go#21857
rpc/websocket.gocmd/geth/les_test.go#21871
#21919
cmd/geth/testdata/vcheck/data.jsoncmd/geth/accountcmd_test.go#21919
build/ci.go#21798
#21986
trie/trie_test.goles/odr_requests.go#21907
core/state_processor.go#21869
graphql/graphql_test.gocore/vm/evm.go#21903
cmd/utils/flags.go#21854
#21903
#21906
light/odr_util.goaccounts/hd_test.goles/serverpool_test.gographql/service.golight/lightchain.goaccounts/abi/bind/bind_test.goparams/config.gocore/state/sync_test.gop2p/enode/nodedb.gocore/state_transition.go#21869
accounts/hd.gocore/vm/contracts_test.gocmd/geth/misccmd.goles/peer.go.travis.yml#21798
core/vm/instructions.go#21903
les/peer_test.gocore/blockchain.go#21471
tests/fuzzers/txfetcher/txfetcher_fuzzer.goles/odr.goeth/tracers/tracers_test.gobuild/checksums.txtcrypto/secp256k1/dummy.goconsensus/ethash/algorithm.gocmd/devp2p/nodesetcmd.gooss-fuzz.sh.github/ISSUE_TEMPLATE/feature.mdconsole/bridge.gop2p/discover/v5_udp.gographql/graphql.gocore/evm.gotests/fuzzers/rlp/rlp_fuzzer.gointernal/cmdtest/test_cmd.gocore/vm/instructions_test.gorpc/endpoints.go.github/ISSUE_TEMPLATE/bug.mdaccounts/keystore/wallet.go#21914
les/server_handler.go#21974
accounts/abi/bind/backends/simulated_test.gomobile/bind.gocrypto/bn256/cloudflare/bn256.go#21815
p2p/server.goles/utils/weighted_select.gotrie/secure_trie.golight/odr.gocore/vm/runtime/env.gocmd/evm/internal/t8ntool/execution.goles/odr_test.gotests/vm_test_util.gocore/state/database.goevent/feed_test.gominer/worker.gocrypto/bls12381/fp_test.go.github/ISSUE_TEMPLATE/question.mdaccounts/abi/bind/backends/simulated.go#21356
#21869
les/retrieve.gop2p/simulations/network.goles/benchmark.gocore/vm/gas_table.gocmd/clef/main.go#21903
les/sync_test.go#21907
cmd/geth/run_test.gotrie/sync_test.gocrypto/secp256k1/libsecp256k1/src/modules/recovery/dummy.gocrypto/secp256k1/libsecp256k1/dummy.gocrypto/bn256/google/constants.go#21847
tests/fuzzers/stacktrie/trie_fuzzer.gocrypto/secp256k1/libsecp256k1/include/dummy.gocrypto/secp256k1/libsecp256k1/src/modules/dummy.gocrypto/secp256k1/libsecp256k1/src/dummy.gocore/vm/runtime/runtime.go#21956
crypto/secp256k1/libsecp256k1/src/modules/ecdh/dummy.gocrypto/secp256k1/libsecp256k1/contrib/dummy.gocommon/bitutil/compress_fuzz.goeth/gen_config.gocmd/geth/main.go#21402
#21859
#21903
les/sync.gocore/tx_pool_test.go#21903
p2p/nodestate/nodestate_test.gocrypto/bn256/google/bn256.golight/odr_test.gominer/unconfirmed_test.goles/utils/expiredvalue.gocmd/faucet/faucet.goles/api_backend.gocore/state_prefetcher.gogo.sum#21798
#21934
les/enr_entry.goeth/api_backend.goeth/discovery.gotests/state_test_util.goles/protocol.gocore/vm/gas_table_test.goaccounts/abi/reflect_test.gocore/state/statedb.gocmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.2eth/tracers/tracer_test.gocmd/geth/testdata/vcheck/sigs/vulnerabilities.json.minisig.3metrics/cpu_enabled.golight/trie.goeth/filters/api.gocmd/geth/testdata/vcheck/sigs/vulnerabilities.json.minisig.2les/flowcontrol/control.gocmd/puppeth/genesis.gocmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.3accounts/abi/bind/base.goeth/tracers/tracer.gocmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.1light/postprocess.gocrypto/secp256k1/curve.gocore/state/state_test.gocmd/geth/testdata/vcheck/sigs/vulnerabilities.json.minisig.1cmd/geth/dao_test.goles/serverpool.gop2p/nat/nat.goles/test_helper.golight/lightchain_test.gocore/blockchain_test.gorlp/encode_test.gocrypto/bls12381/g1.goeth/backend.go#21906
crypto/bls12381/g2.goles/lespay/server/prioritypool.gogo.mod#21798
#21934
les/lespay/server/balance.goles/lespay/server/balance_tracker.gocmd/geth/usage.go#21903
rpc/client.gocommon/hexutil/json_test.goles/client.goaccounts/keystore/passphrase.gocmd/geth/testdata/vcheck/signifykey.pubmobile/ethereum.goconsensus/ethash/ethash.gocmd/evm/runner.gocore/vm/logger_test.goaccounts/scwallet/wallet.gocmd/geth/genesis_test.gocmd/geth/testdata/vcheck/signify-sigs/data.json.sigcore/types/transaction.gointernal/ethapi/api.gotrie/iterator.gocmd/devp2p/internal/ethtest/testdata/genesis.jsoninternal/debug/flags.goeth/api_test.gosigner/core/signed_data.gocmd/geth/testdata/vcheck/minisign.pubeth/filters/filter_system.goeth/downloader/api.goparams/version.gocmd/geth/testdata/vcheck/minisign.seccmd/devp2p/internal/ethtest/chain_test.gocmd/evm/disasm.gocmd/evm/compiler.gocmd/geth/testdata/vcheck/signifykey.secaccounts/accounts.gocmd/devp2p/dnscmd.gocore/genesis.goaccounts/abi/type_test.gocontracts/checkpointoracle/oracle.goaccounts/usbwallet/wallet.gointernal/flags/helpers.goeth/filters/filter_system_test.gotests/fuzzers/keystore/keystore-fuzzer.gop2p/nodestate/nodestate.gocmd/evm/staterunner.gocmd/geth/config.gocontracts/checkpointoracle/oracle_test.gocore/vm/operations_acl.goevent/event_test.goaccounts/abi/bind/template.gotrie/committer.gonode/rpcstack.goeth/config.goparams/protocol_params.gotests/fuzzers/bls12381/testdata/fuzz_g1_mul_seed_corpus.ziptests/fuzzers/bls12381/testdata/fuzz_g2_multiexp_seed_corpus.ziptests/fuzzers/bls12381/testdata/fuzz_pairing_seed_corpus.ziptests/fuzzers/bls12381/testdata/fuzz_g1_add_seed_corpus.ziptests/fuzzers/bls12381/testdata/fuzz_map_g1_seed_corpus.zipcmd/devp2p/internal/ethtest/testdata/chain.rlpcmd/devp2p/internal/ethtest/testdata/halfchain.rlptests/fuzzers/bls12381/testdata/fuzz_g2_add_seed_corpus.zipcmd/devp2p/internal/ethtest/testdata/halfchain.rlp.gztests/fuzzers/bls12381/testdata/fuzz_g1_multiexp_seed_corpus.ziptests/fuzzers/bls12381/testdata/fuzz_map_g2_seed_corpus.ziptests/fuzzers/bls12381/testdata/fuzz_g2_mul_seed_corpus.zipcmd/devp2p/internal/ethtest/testdata/fullchain.rlp.gz#21894