Merge 1.9.10 upstream #1115
Merged
Merge 1.9.10 upstream #1115
Conversation
This file contains hidden or 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
* core: fix staticcheck warnings * fix goimports
core/rawdb: fix reinit regression caused by the hash check PR
deps: update fastcache to 1.5.3
The original idea behind this change was to remove a use of the deprecated CancelRequest method. Simply removing it would've been an option, but I couldn't resist and did a bit of a refactoring instead. All remote sealing code was contained in a single giant function. Remote sealing is now extracted into its own object, remoteSealer.
This change: - removes the PostChainEvents method on core.BlockChain. - sorts 'removed log' events by block number. - fire the NewChainHead event if we inject a canonical block into the chain even if the entire insertion is not successful. - guarantees correct event ordering in all cases.
trie: track dirty cache metrics, track clean writes on commit
params: update CHTs for v1.9.9 release
* consensus/ethash, params: implement eip-2384: bump difficulty bomb * params: EIP 2384 compat checks * consensus, params: add Muir Glacier block number (mainnet,ropsten) + official name * core/forkid: forkid tests for muir glacier * params/config: address review concerns * params, core/forkid: review nitpicks * cmd/geth,eth,les: add override option for muir glacier * params: nit fix
1.to build stress tests Depends-On: 6269e55
…910) * fuzzers: fuzzers for keystore, rlp, trie, whisper (cred to @guidovranken) * fuzzers: move fuzzers to testdata * testdata/fuzzers: documentation * testdata/fuzzers: corpus for rlp * tests/fuzzers: fixup
core: removed old invalid comment
appveyor: bump Go to 1.13.6 on Windows
travis: bump Android builder to Go 1.13.6
params: update CHTs for v1.9.10 release
# Conflicts: # accounts/usbwallet/ledger.go # cmd/geth/config.go # cmd/geth/main.go # consensus/ethash/algorithm_test.go # consensus/ethash/api.go # consensus/ethash/consensus.go # consensus/ethash/ethash.go # consensus/ethash/sealer.go # consensus/ethash/sealer_test.go # core/blockchain.go # core/blockchain_test.go # core/forkid/forkid_test.go # core/genesis.go # core/vm/contracts.go # les/client.go # les/txrelay.go # miner/stress_clique.go # miner/stress_ethash.go # miner/worker.go # miner/worker_test.go # params/config.go # params/version.go
# Conflicts: # Makefile # README.md # accounts/abi/bind/backends/simulated.go # accounts/abi/bind/backends/simulated_test.go # build/checksums.txt # build/ci.go # cmd/puppeth/module_dashboard.go # consensus/ethash/consensus.go # core/blockchain.go # core/headerchain.go # core/tx_list.go # core/tx_pool.go # light/lightchain.go # params/config.go # params/version.go
mcortesi
requested review from
asaj,
kobigurk,
timmoreton and
tkporter
as code owners
kevjue
reviewed
Jul 28, 2020
|
This upstream PR ethereum/go-ethereum#20453 (which is actually a fix for a bug that @asaj submitted to upstream geth) should make this celo-blockchain PR unnecessary and revert-able: #333. One thing to consider if the celo-blockchain PR is reverted is if it will still be backwards compatible. |
kevjue
approved these changes
Jul 28, 2020
There was a problem hiding this comment.
LGTM! Regarding this comment (#1115 (comment)), I suppose it's not totally necessary to revert the PR for this merge.
However, if you decide not to revert the PR, then please create an issue for it.
Closed
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.
Description
Tested
Backwards compatibility
Yes