mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-12 23:13:45 +00:00
* Upgrade geth to v1.9.14 (#75) * fix: resolve conflict * chg: use bor url for import * Fix regressions from merge Co-authored-by: Jaynti Kanani <jdkanani@gmail.com> * Bor update 1.9.16 (#77) * cmd, consensus: add option to disable mmap for DAG caches/datasets (#20484) * cmd, consensus: add option to disable mmap for DAG caches/datasets * consensus: add benchmarks for mmap with/with lock * cmd/clef: add newaccount command (#20782) * cmd/clef: add newaccount command * cmd/clef: document clef_New, update API versioning * Update cmd/clef/intapi_changelog.md Co-Authored-By: ligi <ligi@ligi.de> * Update signer/core/uiapi.go Co-Authored-By: ligi <ligi@ligi.de> Co-authored-by: ligi <ligi@ligi.de> * eth: add debug_accountRange API (#19645) This new API allows reading accounts and their content by address range. Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com> * travis: allow cocoapods deploy to fail (#20833) * whisper/whisperv6: decrease pow requirement in tests (#20815) * metrics: improve TestTimerFunc (#20818) The test failed due to what appears to be fluctuations in time.Sleep, which is not the actual method under test. This change modifies it so we compare the metered Max to the actual time instead of the desired time. * les: create utilities as common package (#20509) * les: move execqueue into utilities package execqueue is a util for executing queued functions in a serial order which is used by both les server and les client. Move it to common package. * les: move randselect to utilities package weighted_random_selector is a helpful tool for randomly select items maintained in a set but based on the item weight. It's used anywhere is LES package, mainly by les client but will be used in les server with very high chance. So move it into a common package as the second step for les separation. * les: rename to utils * README: update private network genesis spec with istanbul (#20841) * add istanbul and muirGlacier to genesis states in README * remove muirGlacier, relocate istanbul * whisper: fix whisper go routine leak with sync wait group (#20844) * cmd/evm: Rework execution stats (#20792) - Dump stats also for --bench flag. - From memory stats only show number and size of allocations. This is what `test -bench` shows. I doubt others like number of GC runs are any useful, but can be added if requested. - Now the mem stats are for single execution in case of --bench. * cmd/devp2p, cmd/wnode, whisper: add missing calls to Timer.Stop (#20843) * p2p/server: add UDP port mapping goroutine to wait group (#20846) * accounts/abi faster unpacking of int256 (#20850) * p2p/discv5: add missing Timer.Stop calls (#20853) * miner/worker: add missing timer.Stop call (#20857) * cmd/geth: fix bad genesis test (#20860) * eth/filters: add missing Ticker.Stop call (#20862) * eth/fetcher: add missing timer.Stop calls (#20861) * les: add missing Ticker.Stop call (#20864) * event: add missing timer.Stop call in TestFeed (#20868) * metrics: add missing calls to Ticker.Stop in tests (#20866) * ethstats: add missing Ticker.Stop call (#20867) * p2p/discv5, p2p/testing: add missing Timer.Stop calls in tests (#20869) * core: add missing Timer.Stop call in TestLogReorgs (#20870) * rpc: add missing timer.Stop calls in websocket tests (#20863) * crypto/ecies: improve concatKDF (#20836) This removes a bunch of weird code around the counter overflow check in concatKDF and makes it actually work for different hash output sizes. The overflow check worked as follows: concatKDF applies the hash function N times, where N is roundup(kdLen, hashsize) / hashsize. N should not overflow 32 bits because that would lead to a repetition in the KDF output. A couple issues with the overflow check: - It used the hash.BlockSize, which is wrong because the block size is about the input of the hash function. Luckily, all standard hash functions have a block size that's greater than the output size, so concatKDF didn't crash, it just generated too much key material. - The check used big.Int to compare against 2^32-1. - The calculation could still overflow before reaching the check. The new code in concatKDF doesn't check for overflow. Instead, there is a new check on ECIESParams which ensures that params.KeyLen is < 512. This removes any possibility of overflow. There are a couple of miscellaneous improvements bundled in with this change: - The key buffer is pre-allocated instead of appending the hash output to an initially empty slice. - The code that uses concatKDF to derive keys is now shared between Encrypt and Decrypt. - There was a redundant invocation of IsOnCurve in Decrypt. This is now removed because elliptic.Unmarshal already checks whether the input is a valid curve point since Go 1.5. Co-authored-by: Felix Lange <fjl@twurst.com> * rpc: metrics for JSON-RPC method calls (#20847) This adds a couple of metrics for tracking the timing and frequency of method calls: - rpc/requests gauge counts all requests - rpc/success gauge counts requests which return err == nil - rpc/failure gauge counts requests which return err != nil - rpc/duration/all timer tracks timing of all requests - rpc/duration/<method>/<success/failure> tracks per-method timing * mobile: use bind.NewKeyedTransactor instead of duplicating (#20888) It's better to reuse the existing code to create a keyed transactor than to rewrite the logic again. * all: fix a bunch of inconsequential goroutine leaks (#20667) The leaks were mostly in unit tests, and could all be resolved by adding suitably-sized channel buffers or by restructuring the test to not send on a channel after an error has occurred. There is an unavoidable goroutine leak in Console.Interactive: when we receive a signal, the line reader cannot be unblocked and will get stuck. This leak is now documented and I've tried to make it slightly less bad by adding a one-element buffer to the output channels of the line-reading loop. Should the reader eventually awake from its blocked state (i.e. when stdin is closed), at least it won't get stuck trying to send to the interpreter loop which has quit long ago. Co-authored-by: Felix Lange <fjl@twurst.com> * internal/ethapi: add CallArgs.ToMessage method (#20854) ToMessage is used to convert between ethapi.CallArgs and types.Message. It reduces the length of the DoCall method by about half by abstracting out the conversion between the CallArgs and the Message. This should improve the code's maintainability and reusability. * eth, les: fix flaky tests (#20897) * les: fix flaky test * eth: fix flaky test * cmd/geth: enable metrics for geth import command (#20738) * cmd/geth: enable metrics for geth import command * cmd/geth: enable metrics-flags for import command * core/vm: use a callcontext struct (#20761) * core/vm: use a callcontext struct * core/vm: fix tests * core/vm/runtime: benchmark * core/vm: make intpool push inlineable, unexpose callcontext * docs/audits: add discv5 protocol audits from LA and C53 (#20898) * .github: change gitter reference to discord link in issue template (#20896) * couple of fixes to docs in clef (#20900) * p2p/discover: add initial discovery v5 implementation (#20750) This adds an implementation of the current discovery v5 spec. There is full integration with cmd/devp2p and enode.Iterator in this version. In theory we could enable the new protocol as a replacement of discovery v4 at any time. In practice, there will likely be a few more changes to the spec and implementation before this can happen. * build: upgrade to golangci-lint 1.24.0 (#20901) * accounts/scwallet: remove unnecessary uses of fmt.Sprintf * cmd/puppeth: remove unnecessary uses of fmt.Sprintf * p2p/discv5: remove unnecessary use of fmt.Sprintf * whisper/mailserver: remove unnecessary uses of fmt.Sprintf * core: goimports -w tx_pool_test.go * eth/downloader: goimports -w downloader_test.go * build: upgrade to golangci-lint 1.24.0 * whisper/mailserver : recover corrupt db files before opening (#20891) * whisper/mailserver : recover db file when openfile corrupted * whisper/mailserver : fix db -> s.db * whisper/mailserver : common/errors for dbfile * accounts/abi/bind: Refactored topics (#20851) * accounts/abi/bind: refactored topics * accounts/abi/bind: use store function to remove code duplication * accounts/abi/bind: removed unused type defs * accounts/abi/bind: error on tuples in topics * Cosmetic changes to restart travis build Co-authored-by: Guillaume Ballet <gballet@gmail.com> * node: allow websocket and HTTP on the same port (#20810) This change makes it possible to run geth with JSON-RPC over HTTP and WebSocket on the same TCP port. The default port for WebSocket is still 8546. geth --rpc --rpcport 8545 --ws --wsport 8545 This also removes a lot of deprecated API surface from package rpc. The rpc package is now purely about serving JSON-RPC and no longer provides a way to start an HTTP server. * crypto: improve error messages in LoadECDSA (#20718) This improves error messages when the file is too short or too long. Also rewrite the test for SaveECDSA because LoadECDSA has its own test now. Co-authored-by: Felix Lange <fjl@twurst.com> * changed date of rpcstack.go since new file (#20904) * accounts/abi/bind: fixed erroneous filtering of negative ints (#20865) * accounts/abi/bind: fixed erroneous packing of negative ints * accounts/abi/bind: added test cases for negative ints in topics * accounts/abi/bind: fixed genIntType for go 1.12 * accounts/abi: minor nitpick * cmd: deprecate --testnet, use named networks instead (#20852) * cmd/utils: make goerli the default testnet * cmd/geth: explicitly rename testnet to ropsten * core: explicitly rename testnet to ropsten * params: explicitly rename testnet to ropsten * cmd: explicitly rename testnet to ropsten * miner: explicitly rename testnet to ropsten * mobile: allow for returning the goerli spec * tests: explicitly rename testnet to ropsten * docs: update readme to reflect changes to the default testnet * mobile: allow for configuring goerli and rinkeby nodes * cmd/geth: revert --testnet back to ropsten and mark as legacy * cmd/util: mark --testnet flag as deprecated * docs: update readme to properly reflect the 3 testnets * cmd/utils: add an explicit deprecation warning on startup * cmd/utils: swap goerli and ropsten in usage * cmd/geth: swap goerli and ropsten in usage * cmd/geth: if running a known preset, log it for convenience * docs: improve readme on usage of ropsten's testnet datadir * cmd/utils: check if legacy `testnet` datadir exists for ropsten * cmd/geth: check for legacy testnet path in console command * cmd/geth: use switch statement for complex conditions in main * cmd/geth: move known preset log statement to the very top * cmd/utils: create new ropsten configurations in the ropsten datadir * cmd/utils: makedatadir should check for existing testnet dir * cmd/geth: add legacy testnet flag to the copy db command * cmd/geth: add legacy testnet flag to the inspect command * les, les/lespay/client: add service value statistics and API (#20837) This PR adds service value measurement statistics to the light client. It also adds a private API that makes these statistics accessible. A follow-up PR will add the new server pool which uses these statistics to select servers with good performance. This document describes the function of the new components: https://gist.github.com/zsfelfoldi/3c7ace895234b7b345ab4f71dab102d4 Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * README: update min go version to 1.13 (#20911) * travis, appveyor, build, Dockerfile: bump Go to 1.14.2 (#20913) * travis, appveyor, build, Dockerfile: bump Go to 1.14.2 * travis, appveyor: force GO111MODULE=on for every build * core/rawdb: fix data race between Retrieve and Close (#20919) * core/rawdb: fixed data race between retrieve and close closes https://github.com/ethereum/go-ethereum/issues/20420 * core/rawdb: use non-atomic load while holding mutex * accounts/abi: implement new fallback functions (#20764) * accounts/abi: implement new fackball functions In Solidity v0.6.0, the original fallback is separated into two different sub types: fallback and receive. This PR addes the support for parsing new format abi and the relevant abigen functionalities. * accounts/abi: fix unit tests * accounts/abi: minor fixes * accounts/abi, mobile: support jave binding * accounts/abi: address marius's comment * accounts/abi: Work around the uin64 conversion issue Co-authored-by: Guillaume Ballet <gballet@gmail.com> * trie: fix concurrent usage of secKeyBuf, ref #20920 * all: simplify and fix database iteration with prefix/start (#20808) * core/state/snapshot: start fixing disk iterator seek * ethdb, rawdb, leveldb, memorydb: implement iterators with prefix and start * les, core/state/snapshot: iterator fixes * all: remove two iterator methods * all: rename Iteratee.NewIteratorWith -> NewIterator * ethdb: fix review concerns * params: update CHTs for the 1.9.13 release * params: release Geth v1.9.13 * params: begin v1.9.14 release cycle * p2p/discover: add helper methods to UDPv5 (#20918) This adds two new methods to UDPv5, AllNodes and LocalNode. AllNodes returns all the nodes stored in the local table; this is useful for the purposes of metrics collection and also debugging any potential issues with other discovery v5 implementations. LocalNode returns the local node object. The reason for exposing this is so that users can modify and set/delete new key-value entries in the local record. * event: fix inconsistency in Lock and Unlock (#20933) Co-authored-by: Felix Lange <fjl@twurst.com> * accounts/abi: Prevent recalculation of internal fields (#20895) * accounts/abi: prevent recalculation of ID, Sig and String * accounts/abi: fixed unpacking of no values * accounts/abi: multiple fixes to arguments * accounts/abi: refactored methodName and eventName This commit moves the complicated logic of how we assign method names and event names if they already exist into their own functions for better readability. * accounts/abi: prevent recalculation of internal In this commit, I changed the way we calculate the string representations, sig representations and the id's of methods. Before that these fields would be recalculated everytime someone called .Sig() .String() or .ID() on a method or an event. Additionally this commit fixes issue #20856 as we assign names to inputs with no name (input with name "" becomes "arg0") * accounts/abi: added unnamed event params test * accounts/abi: fixed rebasing errors in method sig * accounts/abi: fixed rebasing errors in method sig * accounts/abi: addressed comments * accounts/abi: added FunctionType enumeration * accounts/abi/bind: added test for unnamed arguments * accounts/abi: improved readability in NewMethod, nitpicks * accounts/abi: method/eventName -> overloadedMethodName * cmd, core: remove override muir glacier and override istanbul (#20942) * snapshot: add Unlock before return (#20948) * Forget Unlock in snapshot * Remove Unlock before panic * core/state/snapshot: make difflayer account iterator seek operation inclusive * p2p: defer wait group done in protocol start (#20951) * go.mod : update fastcache to 1.5.7 (#20936) * all: seperate consensus error and evm internal error (#20830) * all: seperate consensus error and evm internal error There are actually two types of error will be returned when a tranaction/message call is executed: (a) consensus error (b) evm internal error. The former should be converted to a consensus issue, e.g. The sender doesn't enough asset to purchase the gas it specifies. The latter is allowed since evm itself is a blackbox and internal error is allowed to happen. This PR emphasizes the difference by introducing a executionResult structure. The evm error is embedded inside. So if any error returned, it indicates consensus issue happens. And also this PR improve the `EstimateGas` API to return the concrete revert reason if the transaction always fails * all: polish * accounts/abi/bind/backends: add tests * accounts/abi/bind/backends, internal: cleanup error message * all: address comments * core: fix lint * accounts, core, eth, internal: address comments * accounts, internal: resolve revert reason if possible * accounts, internal: address comments * core: mirror full node reorg logic in light client too (#20931) * core: fix the condition of reorg * core: fix nitpick to only retrieve head once * core: don't reorg if received chain is longer at same diff Co-authored-by: Péter Szilágyi <peterke@gmail.com> * accounts/keystore: fix double import race (#20915) * accounts/keystore: fix race in Import/ImportECDSA * accounts/keystore: added import/export tests * cmd/geth: improved TestAccountImport test * accounts/keystore: added import/export tests * accounts/keystore: fixed naming * accounts/keystore: fixed typo * accounts/keystore: use mutex instead of rwmutex * accounts: use errors instead of fmt * trie: initial implementation for range proof (#20908) * trie: initial implementation for range proof * trie: add benchmark * trie: fix lint * trie: fix minor issue * trie: unset the edge valuenode as well * trie: unset the edge valuenode as nilValuenode * core/state/snapshot: fix binary iterator (#20970) * p2p/enode: update code comment (#20972) It is possible to specify enode URLs using domain name since commitb90cdbaa79, but the code comment still said that only IP addresses are allowed. Co-authored-by: admin@komgo.io <KomgoRocks2018!> * eth: fix shutdown regression to abort downloads, not just cancel * node: shut down all node-related HTTP servers gracefully (#20956) Rather than just closing the underlying network listener to stop our HTTP servers, use the graceful shutdown procedure, waiting for any in-process requests to finish. * accounts/abi: added abi test cases, minor bug fixes (#20903) * accounts/abi: added documentation * accounts/abi: reduced usage of arguments.LengthNonIndexed * accounts/abi: simplified reflection logic * accounts/abi: moved testjson data into global declaration * accounts/abi: removed duplicate test cases * accounts/abi: reworked abi tests * accounts/abi: added more tests for abi packing * accounts/abi/bind: refactored base tests * accounts/abi: run pack tests as subtests * accounts/abi: removed duplicate tests * accounts/abi: removed unnused arguments.LengthNonIndexed Due to refactors to the code, we do not need the arguments.LengthNonIndexed function anymore. You can still get the length by calling len(arguments.NonIndexed()) * accounts/abi: added type test * accounts/abi: modified unpack test to pack test * accounts/abi: length check on arrayTy * accounts/abi: test invalid abi * accounts/abi: fixed rebase error * accounts/abi: fixed rebase errors * accounts/abi: removed unused definition * accounts/abi: merged packing/unpacking tests * accounts/abi: fixed [][][32]bytes encoding * accounts/abi: added tuple test cases * accounts/abi: renamed getMockLog -> newMockLog * accounts/abi: removed duplicate test * accounts/abi: bools -> booleans * core: add check in AddChildIndexer to avoid double lock (#20982) This fixes a theoretical double lock condition which could occur in indexer.AddChildIndexer(indexer) Nobody would ever do that though. Co-authored-by: Felix Lange <fjl@twurst.com> * rpc: make ExampleClientSubscription work with the geth API (#19483) This corrects the call to eth_getBlockByNumber, which previously returned this error: can't get latest block: missing value for required argument 1 Co-authored-by: Felix Lange <fjl@twurst.com> * core: improve TestLogRebirth (#20961) This is a resubmit of #20668 which rewrites the problematic test without any additional goroutines. It also documents the test better. The purpose of this test is checking whether log events are sent correctly when importing blocks. The test was written at a time when blockchain events were delivered asynchronously, making the check hard to pull off. Now that core.BlockChain delivers events synchronously during the call to InsertChain, the test can be simplified. Co-authored-by: BurtonQin <bobbqqin@gmail.com> * go.mod: upgrade to golang-lru v0.5.4 (#20992) golang-lru is now a go module, and the upgrade corrects a couple of minor issues. In particular, the library could crash if you inserted nil into an LRU cache. * rpc: add explicit 200 response for empty HTTP GET (#20952) * event, whisper/whisperv6: use defer where possible (#20940) * signer, log: properly escape character sequences (#20987) * signer: properly handle terminal escape characters * log: use strconv conversion instead of custom escape function * log: remove relection tests for nil * go.mod : goupnp v1.0.0 upgrade (#20996) * core/state/snapshot: implement storage iterator (#20971) * core/state/snapshot: implement storage iterator * core/state/snapshot, tests: implement helper function * core/state/snapshot: fix storage issue If an account is deleted in the tx_1 but recreated in the tx_2, the it can happen that in this diff layer, both destructedSet and storageData records this account. In this case, the storage iterator should be able to iterate the slots belong to new account but disable further iteration in deeper layers(belong to old account) * core/state/snapshot: address peter and martin's comment * core/state: address comments * core/state/snapshot: fix test * core/state/snapshot: fix journal nil deserialziation * core/state/snapshot: fix trie generator reporter (#21004) * accounts/external: fill account-cache if that hasn't already been done, fixes #20995 (#20998) * go.sum: run go mod tidy (#21014) * les: remove invalid use of t.Fatal in TestHandshake (#21012) * accounts/external: convert signature v value to 0/1 (#20997) This fixes an issue with clef, which already transforms the signature to use the legacy 27/28 encoding. Fixes #20994 * tests: cleanup snapshot generator goroutine leak * accounts/abi: removed Kind from Type struct (#21009) * accounts/abi: removed Kind from Type struct * accounts/abi: removed unused code * accounts/abi: move U256Bytes to common/math (#21020) * core/state/snapshot: release iterator after verification * cmd/utils: renames flags related to http-rpc server (#20935) * rpc flags related to starting http server renamed to http * old rpc flags aliased and still functional * pprof flags fixed * renames gpo related flags * linted * renamed rpc flags for consistency and clarity * added warn logs * added more warn logs for all deprecated flags for consistency * moves legacy flags to separate file, hides older flags under show-deprecated-flags command * legacy prefix and moved some more legacy flags to legacy file * fixed circular import * added docs * fixed imports lint error * added notes about when flags were deprecated * cmd/utils: group flags by deprecation date + reorder by date, * modified deprecated comments for consistency, added warn log for --rpc * making sure deprecated flags are still functional * show-deprecated-flags command cleaned up * fixed lint errors * corrected merge conflict * IsSet --> GlobalIsSet * uncategorized flags, if not deprecated, displayed under misc Co-authored-by: Martin Holst Swende <martin@swende.se> * tests: skip consensus test using 1GB RAM * cmd/geth: handle memfixes on 32bit arch with large RAM * build: raise test timeout back to 10 mins (#21027) * account/abi: remove superfluous type checking (#21022) * accounts/abi: added getType func to Type struct * accounts/abi: fixed tuple unpack * accounts/abi: removed type.Type * accounts/abi: added comment * accounts/abi: removed unused types * accounts/abi: removed superfluous declarations * accounts/abi: typo * eth: skip transaction announcer goroutine on eth<65 * eth: don't inadvertently enable snapshots in archive nodes (#21025) * eth: don't reassign more cache than is being made available * eth: don't inadvertently enable snapshot in a case where --snapshot wasn't given * trie: fix TestBadRangeProof unit test (#21034) * eth/downloader: minor typo fixes in comments (#21035) * core: avoid double-lock in tx_pool_test (#20984) * core/state/snapshot: don't create storage list for non-existing accounts * core/state/snapshot: fix typo (#21037) * accounts/abi/bind: add void if no return args specified (#21002) * accounts/abi/bind: add void if no return args specified Currently the java generator generates invalid input on pure/view functions that have no return type. e.g. `function f(uint u) view public {}` This is not a problem in practice as people rarely ever write functions like this. * accounts/abi/bind: use elseif instead of nested if * core/state: include zero-address in state dump if present (#21038) * Include 0x0000 address into the dump if it is present * core/state: go fmt Co-authored-by: Alexey Akhunov <akhounov@gmail.com> * core/state: abort commit if read errors have occurred (#21039) This finally adds the error check that the documentation of StateDB.dbErr promises to do. dbErr was added in9e5f03b6c(June 2017), and the check was already missing in that commit. We somehow survived without it for three years. * core/state: avoid statedb.dbErr due to emptyCode (#21051) * core/state: more verbose stateb errors * core/state: fix flaw * core/state: fixed lint Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * build: fix CLI params for windows LNK files (#21055) * build: Fix CLI params for windows LNK files closes #21054 * Remove parameters * core/state: make GetCodeSize mirror GetCode implementation wise * accounts/abi/bind/backend, internal/ethapi: recap gas limit with balance (#21043) * accounts/abi/bind/backend, internal/ethapi: recap gas limit with balance * accounts, internal: address comment and fix lint * accounts, internal: extend log message * tiny nits to format hexutil.Big and nil properly Co-authored-by: Péter Szilágyi <peterke@gmail.com> * params, cmd/utils: remove outdated discv5 bootnodes, deprecate flags (#20949) * params: remove outdated discv5 bootnodes * cmd/utils: deprecated bootnodesv4/v5 flags * console: fix some crashes/errors in the bridge (#21050) Fixes #21046 * core/rawdb: stop freezer process as part of freezer.Close() (#21010) * core/rawdb: Stop freezer process as part of freezer.Close() When you call db.Close(), it was closing the leveldb database first, then closing the freezer, but never stopping the freezer process. This could cause the freezer to attempt to write to leveldb after leveldb had been closed, leading to a crash with a non-zero exit code. This change adds a quit channel to the freezer, and freezer.Close() will not return until the freezer process has stopped. Additionally, when you call freezerdb.Close(), it will close the AncientStore before closing leveldb, to ensure that the freezer goroutine will be stopped before leveldb is closed. * core/rawdb: Fix formatting for golint * core/rawdb: Use backoff flag to avoid repeating select * core/rawdb: Include accidentally omitted backoff * p2p: add 0 port check in dialer (#21008) * p2p: add low port check in dialer We already have a check like this for UDP ports, add a similar one in the dialer. This prevents dials to port zero and it's also an extra layer of protection against spamming HTTP servers. * p2p/discover: use errLowPort in v4 code * p2p: change port check * p2p: add comment * p2p/simulations/adapters: ensure assigned port is in all node records * params: bump CHTs for the v1.9.14 release * cmd, core, eth: background transaction indexing (#20302) * cmd, core, eth: init tx lookup in background * core/rawdb: tiny log fixes to make it clearer what's happening * core, eth: fix rebase errors * core/rawdb: make reindexing less generic, but more optimal * rlp: implement rlp list iterator * core/rawdb: new implementation of tx indexing/unindex using generic tx iterator and hashing rlp-data * core/rawdb, cmd/utils: fix review concerns * cmd/utils: fix merge issue * core/rawdb: add some log formatting polishes Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> * core: fixup blockchain tests (#21062) core: fixup blockchain tests * les: drop the message if the entire p2p connection is stuck (#21033) * les: drop the message if the entire p2p connection is stuck * les: fix lint * core/rawdb : log format fix for Unindexing transaction (#21064) * core/rawdb : log format fix for Unindexing transaction * core/rawdb: tiny fixup Co-authored-by: Péter Szilágyi <peterke@gmail.com> * core/rawdb: remove unused math (#21065) * miner: support disabling empty blockprecommits form the Go API (#20736) * cmd, miner: add noempty-precommit flag * cmd, miner: get rid of external flag * miner: change bool to atomic int * miner: fix tiny typo Co-authored-by: Péter Szilágyi <peterke@gmail.com> * accounts/abi: accounts/abi/bind: Move topics to abi package (#21057) * accounts/abi/bind: added test cases for waitDeployed * accounts/abi/bind: added test case for boundContract * accounts/abi/bind: removed unnecessary resolve methods * accounts/abi: moved topics from /bind to /abi * accounts/abi/bind: cleaned up format... functions * accounts/abi: improved log message * accounts/abi: added type tests * accounts/abi/bind: remove superfluous template methods * accounts/abi: allow overloaded argument names (#21060) * accounts/abi: allow overloaded argument names In solidity it is possible to create the following contract: ``` contract Overloader { struct F { uint _f; uint __f; uint f; } function f(F memory f) public {} } ``` This however resulted in a panic in the abi package. * accounts/abi fixed error handling * core: fix missing receipt on Clique crashes (#21045) * core: fix missing receipt * core: address comment * ethstats: stop report ticker in each loop cycle #21070 (#21071) Co-authored-by: Hao Duan <duan.hao@hyperchain.cn> * params: release go-ethereum v1.9.14 * params: begin v1.9.15 release cycle * cmd: fix log contexts (#21077) * accounts/abi: simplify reflection logic (#21058) * accounts/abi: simplified reflection logic * accounts/abi: simplified reflection logic * accounts/abi: removed unpack * accounts/abi: removed comments * accounts/abi: removed uneccessary complications * accounts/abi: minor changes in error messages * accounts/abi: removed unnused code * accounts/abi: fixed indexed argument unpacking * accounts/abi: removed superfluous test cases This commit removes two test cases. The first one is trivially invalid as we have the same test cases as passing in packing_test.go L375. The second one passes now, because we don't need the mapArgNamesToStructFields in unpack_atomic anymore. Checking for purely underscored arg names generally should not be something we do as the abi/contract is generally out of the control of the user. * accounts/abi: removed comments, debug println * accounts/abi: added commented out code * accounts/abi: addressed comments * accounts/abi: remove unnecessary dst.CanSet check * accounts/abi: added dst.CanSet checks * console: fix unlockAccount argument count check (#21081) * cmd/clef, signer/core: password input fixes (#20960) * cmd/clef, signer/core: use better terminal input for passwords, make it possible to avoid boot-up warning * all: move commonly used prompter to isolated (small) package * cmd/clef: Add new --acceptWarn to clef README * cmd/clef: rename flag 'acceptWarn' to 'suppress-bootwarn' Co-authored-by: ligi <ligi@ligi.de> * accounts: add blockByNumberNoLock() to avoid double-lock (#20983) * abi/bind/backends: testcase for double-lock * accounts: add blockByNumberNoLock to avoid double-lock * backend/simulated: use stateroot, not blockhash for retrieveing state Co-authored-by: Martin Holst Swende <martin@swende.se> * whisper: use canonical import name of package go-ethereum (#21099) * trie: extend range proofs with non-existence (#21000) * trie: implement range proof with non-existent edge proof * trie: fix cornercase * trie: consider empty range * trie: add singleSide test * trie: support all-elements range proof * trie: fix typo * trie: tiny typos and formulations Co-authored-by: Péter Szilágyi <peterke@gmail.com> * les, les/lespay: implement new server pool (#20758) This PR reimplements the light client server pool. It is also a first step to move certain logic into a new lespay package. This package will contain the implementation of the lespay token sale functions, the token buying and selling logic and other components related to peer selection/prioritization and service quality evaluation. Over the long term this package will be reusable for incentivizing future protocols. Since the LES peer logic is now based on enode.Iterator, it can now use DNS-based fallback discovery to find servers. This document describes the function of the new components: https://gist.github.com/zsfelfoldi/3c7ace895234b7b345ab4f71dab102d4 * miner: replace use of 'self' as receiver name (#21113) * all: fix typos in comments (#21118) * consensus/clique: remove redundant pair of parentheses (#21104) * core/vm: improve jumpdest lookup (#21123) * consensus/ethash: fix flaky test by reading seal results (#21085) * cmd/utils: fix default DNS discovery configuration (#21124) * metrics/prometheus: define TYPE once, add tests (#21068) * metrics/prometheus: define type once for histograms * metrics/prometheus: test collector * ethdb/leveldb: use timer instead of time.After (#21066) * ethstats: avoid blocking chan when received invalid stats request (#21073) * ethstats: avoid blocking chan when received invalid stats request * ethstats: minor code polishes Co-authored-by: Péter Szilágyi <peterke@gmail.com> * trie: fix for range proof (#21107) * trie: fix for range proof * trie: fix typo * build: upgrade to golangci lint v1.27.0 (#21127) * build: upgrade to golangci-lint v1.27.0 * build: raise lint timeout to 3 minutes * eth: interrupt chain insertion on shutdown (#21114) This adds a new API method on core.BlockChain to allow interrupting running data inserts, and calls the method before shutting down the downloader. The BlockChain interrupt checks are now done through a method instead of inlining the atomic load everywhere. There is no loss of efficiency from this and it makes the interrupt protocol a lot clearer because the check is defined next to the method that sets the flag. * consensus/clique: make internal error private (#21132) Co-authored-by: linjing <linjingjing@baidu.com> * trie: enforce monotonic range in prover and return end marker (#21130) * trie: add hasRightElement indicator * trie: ensure the range is monotonic increasing * trie: address comment and fix lint * trie: address comment * trie: make linter happy Co-authored-by: Péter Szilágyi <peterke@gmail.com> * eth/downloader: more context in errors (#21067) This PR makes use of go 1.13 error handling, wrapping errors and using errors.Is to check a wrapped root-cause. It also removes the travis builders for go 1.11 and go 1.12. * metrics: replace gosigar with gopsutil (#21041) * replace gosigar with gopsutil * removed check for whether GOOS is openbsd * removed accidental import of runtime * potential fix for difference in units between gosig and gopsutil * fixed lint error * remove multiplication factor * uses cpu.ClocksPerSec as the multiplication factor * changed dependency from shirou to renaynay (#20) * updated dep * switching back from using renaynay fork to using upstream as PRs were merged on upstream * removed empty line * optimized imports * tidied go mod * core/vm: EIP-2315, JUMPSUB for the EVM (#20619) * core/vm: implement EIP 2315, subroutines for the EVM * core/vm: eip 2315 - lintfix + check jump dest validity + check ret stack size constraints logger: markdown-friendly traces, validate jumpdest, more testcase, correct opcodes * core/vm: update subroutines acc to eip: disallow walk-into * core/vm/eips: gas cost changes for subroutines * core/vm: update opcodes for EIP-2315 * core/vm: define RETURNSUB as a 'jumping' operation + review concerns Co-authored-by: Martin Holst Swende <martin@swende.se> * p2p/discover: move discv4 encoding to new 'v4wire' package (#21147) This moves all v4 protocol definitions to a new package, p2p/discover/v4wire. The new package will be used for low-level protocol tests. * rpc: send websocket ping when connection is idle (#21142) * rpc: send websocket ping when connection is idle * rpc: use non-blocking send for websocket pingReset * console: handle undefined + null in console funcs (#21160) * core: collect NewTxsEvent items without holding reorg lock (#21145) * core/vm, crypto/bls12381, params: add bls12-381 elliptic curve precompiles (#21018) * crypto: add bls12-381 elliptic curve wrapper * params: add bls12-381 precompile gas parameters * core/vm: add bls12-381 precompiles * core/vm: add bls12-381 precompile tests * go.mod, go.sum: use latest bls12381 lib * core/vm: move point encode/decode functions to base library * crypto/bls12381: introduce bls12-381 library init function * crypto/bls12381: import bls12381 elliptic curve implementation * go.mod, go.sum: remove bls12-381 library * remove unsued frobenious coeffs supress warning for inp that used in asm * add mappings tests for zero inputs fix swu g2 minus z inverse constant * crypto/bls12381: fix typo * crypto/bls12381: better comments for bls12381 constants * crypto/bls12381: swu, use single conditional for e2 * crypto/bls12381: utils, delete empty line * crypto/bls12381: utils, use FromHex for string to big * crypto/bls12381: g1, g2, strict length check for FromBytes * crypto/bls12381: field_element, comparision changes * crypto/bls12381: change swu, isogeny constants with hex values * core/vm: fix point multiplication comments * core/vm: fix multiexp gas calculation and lookup for g1 and g2 * core/vm: simpler imput length check for multiexp and pairing precompiles * core/vm: rm empty multiexp result declarations * crypto/bls12381: remove modulus type definition * crypto/bls12381: use proper init function * crypto/bls12381: get rid of new lines at fatal desciprtions * crypto/bls12-381: fix no-adx assembly multiplication * crypto/bls12-381: remove old config function * crypto/bls12381: update multiplication backend this commit changes mul backend to 6limb eip1962 backend mul assign operations are dropped * core/vm/contracts_tests: externalize test vectors for precompiles * core/vm/contracts_test: externalize failure-cases for precompiles * core/vm: linting * go.mod: tiny up sum file * core/vm: fix goimports linter issues * crypto/bls12381: build tags for plain ASM or ADX implementation Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Péter Szilágyi <peterke@gmail.com> * cmd, core, params: inital support for yolo-v1 testnet (#21154) * core,params,puppeth: inital support for yolo-v1 testnet * cmd/geth, core: add yolov1 console flag * cmd, core, params: YoloV1 bakein fixups Co-authored-by: Péter Szilágyi <peterke@gmail.com> * cmd/geth: fix the fork orders for DAO tests * core: filter out txs with invalid signatures as soon as possible Once we detect an invalid transaction during recovering signatures, we should directly exclude this transaction to avoid validating the signatures hereafter. This should optimize the validations times of transactions with invalid signatures to only one time. * acounts/keystore, cmd/faucet: fix faucet double import, fix twitter url * accounts/keystore, cmd/faucet: return old account to allow unlock * go.mod: upgrade go-duktape to hide unused function warning (#21168) * node: missing comma on toml tags (#21187) * core/vm, crypt/bls12381: fixed comments in bls (#21182) * core/vm: crypto/bls12381: minor code comments * crypto/bls12381: fix comment * core: fix typo in comments (#21181) * internal/ethapi: return revert reason for eth_call (#21083) * internal/ethapi: return revert reason for eth_call * internal/ethapi: moved revert reason logic to doCall * accounts/abi/bind/backends: added revert reason logic to simulated backend * internal/ethapi: fixed linting error * internal/ethapi: check if require reason can be unpacked * internal/ethapi: better error logic * internal/ethapi: simplify logic * internal/ethapi: return vmError() * internal/ethapi: move handling of revert out of docall * graphql: removed revert logic until spec change * rpc: internal/ethapi: added custom error types * graphql: use returndata instead of return Return() checks if there is an error. If an error is found, we return nil. For most use cases it can be beneficial to return the output even if there was an error. This code should be changed anyway once the spec supports error reasons in graphql responses * accounts/abi/bind/backends: added tests for revert reason * internal/ethapi: add errorCode to revert error * internal/ethapi: add errorCode of 3 to revertError * internal/ethapi: unified estimateGasErrors, simplified logic * internal/ethapi: unified handling of errors in DoEstimateGas * rpc: print error data field * accounts/abi/bind/backends: unify simulatedBackend and RPC * internal/ethapi: added binary data to revertError data * internal/ethapi: refactored unpacking logic into newRevertError * accounts/abi/bind/backends: fix EstimateGas * accounts, console, internal, rpc: minor error interface cleanups * Revert "accounts, console, internal, rpc: minor error interface cleanups" This reverts commit2d3ef53c53. * re-apply the good parts of2d3ef53c53* rpc: add test for returning server error data from client Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * params: update CHTs for 1.9.15 release * params: go-ethereum v1.9.15 stable * params: begin v1.9.16 release cycle * cmd/ethkey: support --passwordfile in generate command (#21183) * ethstats: use timer instead of time.sleep (#20924) * core/vm: use uint256 in EVM implementation (#20787) * core/vm: use fixed uint256 library instead of big * core/vm: remove intpools * core/vm: upgrade uint256, fixes uint256.NewFromBig * core/vm: use uint256.Int by value in Stack * core/vm: upgrade uint256 to v1.0.0 * core/vm: don't preallocate space for 1024 stack items (only 16) Co-authored-by: Martin Holst Swende <martin@swende.se> * core/state: avoid escape analysis fault when accessing cached state * accounts/keystore: fix typo in error message (#21200) * accounts/abi: make GetType public again (#21157) * eth/downloader: fix spuriously failing tests (#21149) * eth/downloader tests: fix spurious failing test due to race between receipts/headers * miner tests: fix travis failure on arm64 * eth/downloader: tests - store td in ancients too * core, eth, internal: include read storage entries in structlog output (#21204) * core, eth, internal: extend structLog tracer * core/vm, internal: add storage view * core, internal: add slots to storage directly * core: remove useless * core: address martin's comment * core/vm: fix tests * build, internal/ethapi, crypto/bls12381: fix typos (#21210) speicifc -> specific assigened -> assigned frobenious -> frobenius * go.mod: update uint256 to 1.1.0 (#21206) * internal/web3ext: add missing params to debug.accountRange (#21208) * eth/downloader: don't use defer for unlock before return (#21227) Co-authored-by: linjing <linjingjing@baidu.com> * core/rawdb: swap tailId and itemOffset for deleted items in freezer (#21220) * fix(freezer): tailId filenum offset were misplaced * core/rawdb: assume first item in freezer always start from zero * cmd, eth, internal, les: add txfee cap (#21212) * cmd, eth, internal, les: add gasprice cap * cmd/utils, eth: add default value for gasprice cap * all: use txfee cap * cmd, eth: add fix * cmd, internal: address comments * go.mod: update snappy dependency (#21237) * whisper : use timer.Ticker instead of sleep (#21240) * whisper : use timer.Ticker instead of sleep * lint: Fix linter error Co-authored-by: Guillaume Ballet <gballet@gmail.com> * core/rawdb: fix high memory usage in freezer (#21243) The ancients variable in the freezer is a list of hashes, which identifies all of the hashes to be frozen. The slice is being allocated with a capacity of `limit`, which is the number of the last block this batch will attempt to add to the freezer. That means we are allocating memory for all of the blocks in the freezer, not just the ones to be added. If instead we allocate `limit - f.frozen`, we will only allocate enough space for the blocks we're about to add to the freezer. On mainnet this reduces usage by about 320 MB. * common/fdlimit: build on DragonflyBSD (#21241) * common/fdlimit: build on DragonflyBSD * review feedback * whisper: fix time.sleep by time.ticker in whisper_test (#21251) * p2p: measure packet throughput too, not just bandwidth * cmd/devp2p: add commands for node key management (#21202) These commands mirror the key/URL generation functions of cmd/bootnode. $ devp2p key generate mynode.key $ devp2p key to-enode mynode.key -ip 203.0.113.21 -tcp 30304 enode://78a7746089baf4b8615f54a5f0b67b22b1... * crypto/secp256k1: enable 128-bit int code and endomorphism optimization (#21203) * crypto/secp256k1: enable use of __int128 This speeds up scalar & field calculations a lot. * crypto/secp256k1: enable endomorphism optimization * eth: don't block if transaction broadcast loop fails (#21255) * eth: don't block if transaction broadcast loop is returned * eth: kick out peer if we failed to send message * eth: address comment * trie: reduce allocs in insertPreimage (#21261) * core/vm: fix incorrect computation of BLS discount (#21253) * core/vm: fix incorrect computation of discount During testing on Yolov1 we found that the way geth calculates the discount is not in line with the specification. Basically what we did is calculate 128 * Bls12381GXMulGas * discount / 1000 whenever we received more than 128 pairs of values. Correct would be to calculate k * Bls12381... for k > 128. * core/vm: better logic for discount calculation * core/vm: better calculation logic, added worstcase benchmarks * core/vm: better benchmarking logic * cmd/geth: make import cmd exit with 1 if import errors occurred (#21244) The import command should not return a 0 status code if the import finishes prematurely becaues of an import error. Returning the error causes the program to exit with 1 if the err is non nil. Signed-off-by: meows <b5c6@protonmail.com> * eth: returned revert reason in traceTx (#21195) * eth: returned revert reason in traceTx * eth: return result data * utils: fix ineffectual miner config flags (#21271) Without use of global, these flags didn't actually modify miner configuration, since we weren't grabbing from the proper context scope, which should be global (vs. subcommand). Signed-off-by: meows <b5c6@protonmail.com> * cmd: abstract `getPassPhrase` functions into one (#21219) * [cmd] Abstract `getPassPhrase` functions into one. * cmd/ethkey: fix compilation failure Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * cmd/evm: add state transition tool for testing (#20958) This PR implements the EVM state transition tool, which is intended to be the replacement for our retesteth client implementation. Documentation is present in the cmd/evm/README.md file. Co-authored-by: Felix Lange <fjl@twurst.com> * core: types: less allocations when hashing and tx handling (#21265) * core, crypto: various allocation savings regarding tx handling * core: reduce allocs for gas price comparison This change reduces the allocations needed for comparing different transactions to each other. A call to `tx.GasPrice()` copies the gas price as it has to be safe against modifications and also needs to be threadsafe. For comparing and ordering different transactions we don't need these guarantees * core: added tx.GasPriceIntCmp for comparison without allocation adds a method to remove unneeded allocation in comparison to tx.gasPrice * core/types: pool legacykeccak256 objects in rlpHash rlpHash is by far the most used function in core that allocates a legacyKeccak256 object on each call. Since it is so widely used it makes sense to add pooling here so we relieve the GC. On my machine these changes result in > 100 MILLION less allocations and > 30 GB less allocated memory. * reverted some changes * reverted some changes * trie: use crypto.KeccakState instead of replicating code Co-authored-by: Martin Holst Swende <martin@swende.se> * go.mod: bump gopsutil version (#21275) * go.mod: updated crypto deps causing build failure (#21276) * eth/downloader: fixes data race between synchronize and other methods (#21201) * eth/downloaded: fixed datarace between synchronize and Progress There was a race condition between `downloader.synchronize()` and `Progress` `syncWithPeer` `fetchHeight` `findAncestors` and `processHeaders` This PR changes the behavior of the downloader a bit. Previously the functions `Progress` `syncWithPeer` `fetchHeight` `findAncestors` and `processHeaders` read the syncMode anew within their loops. Now they read the syncMode at the start of their function and don't change it during their runtime. * eth/downloaded: comment * eth/downloader: added comment * cmd/geth: LES priority client test (#20719) This adds a regression test for the LES priority client API. * rlp: avoid list header allocation in encoder (#21274) List headers made up 11% of all allocations during sync. This change removes most of those allocations by keeping the list header values cached in the encoder buffer instead. Since encoder buffers are pooled, list headers are no longer allocated in the common case where an encoder buffer is available for reuse. Co-authored-by: Felix Lange <fjl@twurst.com> * core, txpool: less allocations when handling transactions (#21232) * core: use uint64 for total tx costs instead of big.Int * core: added local tx pool test case * core, crypto: various allocation savings regarding tx handling * Update core/tx_list.go * core: added tx.GasPriceIntCmp for comparison without allocation adds a method to remove unneeded allocation in comparison to tx.gasPrice * core: handle pools full of locals better * core/tests: benchmark for tx_list * core/txlist, txpool: save a reheap operation, avoid some bigint allocs Co-authored-by: Martin Holst Swende <martin@swende.se> * rpc, internal/ethapi: default rpc gascap at 25M + better error message (#21229) * rpc, internal/ethapi: default rpc gascap at 50M + better error message * eth,internal: make globalgascap uint64 * core/tests: fix compilation failure * eth/config: gascap at 25M + minor review concerns * internal/ethapi: default gas to maxgascap, not max int64 (#21284) * ethapi: don't crash when keystore-specific methods are called but external signer used (#21279) * console: prevent importRawKey from getting into CLI history * internal/ethapi: error on keystore-methods when no keystore is present * les/checkpointoracle: don't lookup checkpoint more than once per minute (#21285) * les/checkpointoracle: don't lookup checkpoint more than once per second * les/checkpoint/oracle: change oracle checktime to 1 minute * eth/gasprice: lighter gas price oracle for light client (#20409) This PR reduces the bandwidth used by the light client to compute the recommended gas price. The current mechanism for suggesting the price is: - retrieve recent 20 blocks - get the lowest gas price of these blocks - sort the price array and return the middle(60%) one This works for full nodes, which have all blocks available locally. However, this is very expensive for the light client because the light client needs to retrieve block bodies from the network. The PR changes the default options for light client. With the new config, the light client only retrieves the two latest blocks, but in order to collect more sample transactions, the 3 lowest prices are collected from each block. This PR also changes the behavior for empty blocks. If the block is empty, the lastest price is reused for sampling. * cmd/geth: allow configuring metrics HTTP server on separate endpoint (#21290) Exposing /debug/metrics and /debug/metrics/prometheus was dependent on --pprof, which also exposes other HTTP APIs. This change makes it possible to run the metrics server on an independent endpoint without enabling pprof. * build/ci: handle split up listing (#21293) * rlp: reduce allocations for big.Int and byte array encoding (#21291) This change further improves the performance of RLP encoding by removing allocations for big.Int and [...]byte types. I have added a new benchmark that measures RLP encoding of types.Block to verify that performance is improved. * cmd, node: dump empty value config (#21296) * cmd/clef: Update README with external v6.0.0 & internal v7.0.1 APIs (#21298) Changes include: * Updates response docs for `account_new`, `account_list`, `account_signTransaction` * Removes `account_import`, `account_export` docs * Adds `account_version` docs * Updates request docs for `ui_approveListing`, `ui_approveSignData`, `ui_showInfo`, `ui_showError`, `ui_onApprovedTx` * Adds `ui_approveNewAccount`, `ui_onInputRequired` docs * cmd/devp2p: add discv4 test suite (#21163) This adds a test suite for discovery v4. The test suite is a port of the Hive suite for discovery, and will replace the current suite on Hive soon-ish. The tests can be run locally with this command: devp2p discv4 test -remote enode//... Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/clef: Fix broken link in README and other minor fixes (#21303) * eth: increase timeout in TestBroadcastBlock (#21299) * go.mod: upgrade to github.com/golang/snappy with arm64 asm (#21304) * eth/downloader: fix peer idleness tracking when restarting state sync (#21260) This fixes two issues with state sync restarts: When sync restarts with a new root, some peers can have in-flight requests. Since all peers with active requests were marked idle when exiting sync, the new sync would schedule more requests for those peers. When the response for the earlier request arrived, the new sync would reject it and mark the peer idle again, rendering the peer useless until it disconnected. The other issue was that peers would not be marked idle when they had delivered a response, but the response hadn't been processed before restarting the state sync. This also made the peer useless because it would be permanently marked busy. Co-authored-by: Felix Lange <fjl@twurst.com> * Revert "core, txpool: less allocations when handling transactions (#21232)" Reverting because this change started handling account balances as uint64 in the transaction pool, which is incorrect. This reverts commitaf5c97aebe. * common/math: use math/bits intrinsics for Safe* (#21316) This is a resubmit of ledgerwatch/turbo-geth#556. The performance benefit of this change is negligible, but it does remove a TODO. * cmd/geth, cmd/puppeth: replace deprecated rpc and ws flags in tests and docs (#21317) * accounts/external: remove dependency on internal/ethapi (#21319) Fixes #20535 Co-authored-by: Felix Lange <fjl@twurst.com> * params: go-ethereum v1.9.16 stable * chg: no need GO111MODULE * chg: refactor sync event Co-authored-by: Hanjiang Yu <42531996+de1acr0ix@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: ligi <ligi@ligi.de> Co-authored-by: Wenbiao Zheng <delweng@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Adam Schmideg <adamschmideg@users.noreply.github.com> Co-authored-by: gary rong <garyrong0905@gmail.com> Co-authored-by: Jeff Wentworth <jeff@curvegrid.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Paweł Bylica <chfast@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Luke Champine <luke.champine@gmail.com> Co-authored-by: Boqin Qin <Bobbqqin@gmail.com> Co-authored-by: William Morriss <wjmelements@gmail.com> Co-authored-by: rene <41963722+renaynay@users.noreply.github.com> Co-authored-by: Guillaume Ballet <gballet@gmail.com> Co-authored-by: Raw Pong Ghmoa <58883403+q9f@users.noreply.github.com> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Nishant Das <nish1993@hotmail.com> Co-authored-by: icodezjb <icodezjb@163.com> Co-authored-by: tgyKomgo <52910426+tgyKomgo@users.noreply.github.com> Co-authored-by: Steven E. Harris <seh@panix.com> Co-authored-by: Julian Y <jyap808@users.noreply.github.com> Co-authored-by: ploui <64719999+ploui@users.noreply.github.com> Co-authored-by: Alexey Akhunov <akhounov@gmail.com> Co-authored-by: AusIV <git@ausiv.com> Co-authored-by: Hao Duan <duanhao0814@gmail.com> Co-authored-by: Hao Duan <duan.hao@hyperchain.cn> Co-authored-by: Satpal <28562234+SatpalSandhu61@users.noreply.github.com> Co-authored-by: Martin Michlmayr <tbm@cyrius.com> Co-authored-by: yutianwu <wzxingbupt@gmail.com> Co-authored-by: meowsbits <45600330+meowsbits@users.noreply.github.com> Co-authored-by: Richard Patel <me@terorie.dev> Co-authored-by: sixdays <lj491685571@126.com> Co-authored-by: linjing <linjingjing@baidu.com> Co-authored-by: Greg Colvin <greg@colvin.org> Co-authored-by: chenglin <910372762@qq.com> Co-authored-by: kilic <onurkilic1004@gmail.com> Co-authored-by: Mariano Cortesi <mcortesi@gmail.com> Co-authored-by: Ev <ev@ethereum.org> Co-authored-by: libby kent <viskovitzzz@gmail.com> Co-authored-by: Pau <pau@dabax.net> Co-authored-by: Natsu Kagami <natsukagami@gmail.com> Co-authored-by: Yang Hau <vulxj0j8j8@gmail.com> Co-authored-by: HackyMiner <hackyminer@gmail.com> Co-authored-by: zhangsoledad <787953403@qq.com> Co-authored-by: AusIV <code@ausiv.com> Co-authored-by: meowsbits <b5c6@protonmail.com> Co-authored-by: Binacs <bin646891055@gmail.com> Co-authored-by: chris-j-h <39617426+chris-j-h@users.noreply.github.com> * fix: last index for state sub (#79) * new: add without-heimdall flag for testing purpose * new: add without-heimdall flag * fix: inputs for from and to addresses for transfer log Co-authored-by: Arpit Agarwal <93arpit@gmail.com> Co-authored-by: Hanjiang Yu <42531996+de1acr0ix@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: ligi <ligi@ligi.de> Co-authored-by: Wenbiao Zheng <delweng@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Adam Schmideg <adamschmideg@users.noreply.github.com> Co-authored-by: gary rong <garyrong0905@gmail.com> Co-authored-by: Jeff Wentworth <jeff@curvegrid.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Paweł Bylica <chfast@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Luke Champine <luke.champine@gmail.com> Co-authored-by: Boqin Qin <Bobbqqin@gmail.com> Co-authored-by: William Morriss <wjmelements@gmail.com> Co-authored-by: rene <41963722+renaynay@users.noreply.github.com> Co-authored-by: Guillaume Ballet <gballet@gmail.com> Co-authored-by: Raw Pong Ghmoa <58883403+q9f@users.noreply.github.com> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Nishant Das <nish1993@hotmail.com> Co-authored-by: icodezjb <icodezjb@163.com> Co-authored-by: tgyKomgo <52910426+tgyKomgo@users.noreply.github.com> Co-authored-by: Steven E. Harris <seh@panix.com> Co-authored-by: Julian Y <jyap808@users.noreply.github.com> Co-authored-by: ploui <64719999+ploui@users.noreply.github.com> Co-authored-by: Alexey Akhunov <akhounov@gmail.com> Co-authored-by: AusIV <git@ausiv.com> Co-authored-by: Hao Duan <duanhao0814@gmail.com> Co-authored-by: Hao Duan <duan.hao@hyperchain.cn> Co-authored-by: Satpal <28562234+SatpalSandhu61@users.noreply.github.com> Co-authored-by: Martin Michlmayr <tbm@cyrius.com> Co-authored-by: yutianwu <wzxingbupt@gmail.com> Co-authored-by: meowsbits <45600330+meowsbits@users.noreply.github.com> Co-authored-by: Richard Patel <me@terorie.dev> Co-authored-by: sixdays <lj491685571@126.com> Co-authored-by: linjing <linjingjing@baidu.com> Co-authored-by: Greg Colvin <greg@colvin.org> Co-authored-by: chenglin <910372762@qq.com> Co-authored-by: kilic <onurkilic1004@gmail.com> Co-authored-by: Mariano Cortesi <mcortesi@gmail.com> Co-authored-by: Ev <ev@ethereum.org> Co-authored-by: libby kent <viskovitzzz@gmail.com> Co-authored-by: Pau <pau@dabax.net> Co-authored-by: Natsu Kagami <natsukagami@gmail.com> Co-authored-by: Yang Hau <vulxj0j8j8@gmail.com> Co-authored-by: HackyMiner <hackyminer@gmail.com> Co-authored-by: zhangsoledad <787953403@qq.com> Co-authored-by: AusIV <code@ausiv.com> Co-authored-by: meowsbits <b5c6@protonmail.com> Co-authored-by: Binacs <bin646891055@gmail.com> Co-authored-by: chris-j-h <39617426+chris-j-h@users.noreply.github.com>
1868 lines
69 KiB
Go
1868 lines
69 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// Package downloader contains the manual full chain synchronisation.
|
|
package downloader
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"math/big"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
ethereum "github.com/maticnetwork/bor"
|
|
"github.com/maticnetwork/bor/common"
|
|
"github.com/maticnetwork/bor/core/rawdb"
|
|
"github.com/maticnetwork/bor/core/types"
|
|
"github.com/maticnetwork/bor/ethdb"
|
|
"github.com/maticnetwork/bor/event"
|
|
"github.com/maticnetwork/bor/log"
|
|
"github.com/maticnetwork/bor/metrics"
|
|
"github.com/maticnetwork/bor/params"
|
|
"github.com/maticnetwork/bor/trie"
|
|
)
|
|
|
|
var (
|
|
MaxHashFetch = 512 // Amount of hashes to be fetched per retrieval request
|
|
MaxBlockFetch = 128 // Amount of blocks to be fetched per retrieval request
|
|
MaxHeaderFetch = 192 // Amount of block headers to be fetched per retrieval request
|
|
MaxSkeletonSize = 128 // Number of header fetches to need for a skeleton assembly
|
|
MaxBodyFetch = 128 // Amount of block bodies to be fetched per retrieval request
|
|
MaxReceiptFetch = 256 // Amount of transaction receipts to allow fetching per request
|
|
MaxStateFetch = 384 // Amount of node state values to allow fetching per request
|
|
|
|
rttMinEstimate = 2 * time.Second // Minimum round-trip time to target for download requests
|
|
rttMaxEstimate = 20 * time.Second // Maximum round-trip time to target for download requests
|
|
rttMinConfidence = 0.1 // Worse confidence factor in our estimated RTT value
|
|
ttlScaling = 3 // Constant scaling factor for RTT -> TTL conversion
|
|
ttlLimit = time.Minute // Maximum TTL allowance to prevent reaching crazy timeouts
|
|
|
|
qosTuningPeers = 5 // Number of peers to tune based on (best peers)
|
|
qosConfidenceCap = 10 // Number of peers above which not to modify RTT confidence
|
|
qosTuningImpact = 0.25 // Impact that a new tuning target has on the previous value
|
|
|
|
maxQueuedHeaders = 32 * 1024 // [eth/62] Maximum number of headers to queue for import (DOS protection)
|
|
maxHeadersProcess = 2048 // Number of header download results to import at once into the chain
|
|
maxResultsProcess = 2048 // Number of content download results to import at once into the chain
|
|
maxForkAncestry uint64 = params.ImmutabilityThreshold // Maximum chain reorganisation (locally redeclared so tests can reduce it)
|
|
|
|
reorgProtThreshold = 48 // Threshold number of recent blocks to disable mini reorg protection
|
|
reorgProtHeaderDelay = 2 // Number of headers to delay delivering to cover mini reorgs
|
|
|
|
fsHeaderCheckFrequency = 100 // Verification frequency of the downloaded headers during fast sync
|
|
fsHeaderSafetyNet = 2048 // Number of headers to discard in case a chain violation is detected
|
|
fsHeaderForceVerify = 24 // Number of headers to verify before and after the pivot to accept it
|
|
fsHeaderContCheck = 3 * time.Second // Time interval to check for header continuations during state download
|
|
fsMinFullBlocks = 64 // Number of blocks to retrieve fully even in fast sync
|
|
)
|
|
|
|
var (
|
|
errBusy = errors.New("busy")
|
|
errUnknownPeer = errors.New("peer is unknown or unhealthy")
|
|
errBadPeer = errors.New("action from bad peer ignored")
|
|
errStallingPeer = errors.New("peer is stalling")
|
|
errUnsyncedPeer = errors.New("unsynced peer")
|
|
errNoPeers = errors.New("no peers to keep download active")
|
|
errTimeout = errors.New("timeout")
|
|
errEmptyHeaderSet = errors.New("empty header set by peer")
|
|
errPeersUnavailable = errors.New("no peers available or all tried for download")
|
|
errInvalidAncestor = errors.New("retrieved ancestor is invalid")
|
|
errInvalidChain = errors.New("retrieved hash chain is invalid")
|
|
errInvalidBody = errors.New("retrieved block body is invalid")
|
|
errInvalidReceipt = errors.New("retrieved receipt is invalid")
|
|
errCancelStateFetch = errors.New("state data download canceled (requested)")
|
|
errCancelContentProcessing = errors.New("content processing canceled (requested)")
|
|
errCanceled = errors.New("syncing canceled (requested)")
|
|
errNoSyncActive = errors.New("no sync active")
|
|
errTooOld = errors.New("peer doesn't speak recent enough protocol version (need version >= 62)")
|
|
)
|
|
|
|
type Downloader struct {
|
|
// WARNING: The `rttEstimate` and `rttConfidence` fields are accessed atomically.
|
|
// On 32 bit platforms, only 64-bit aligned fields can be atomic. The struct is
|
|
// guaranteed to be so aligned, so take advantage of that. For more information,
|
|
// see https://golang.org/pkg/sync/atomic/#pkg-note-BUG.
|
|
rttEstimate uint64 // Round trip time to target for download requests
|
|
rttConfidence uint64 // Confidence in the estimated RTT (unit: millionths to allow atomic ops)
|
|
|
|
mode uint32 // Synchronisation mode defining the strategy used (per sync cycle), use d.getMode() to get the SyncMode
|
|
mux *event.TypeMux // Event multiplexer to announce sync operation events
|
|
|
|
checkpoint uint64 // Checkpoint block number to enforce head against (e.g. fast sync)
|
|
genesis uint64 // Genesis block number to limit sync to (e.g. light client CHT)
|
|
queue *queue // Scheduler for selecting the hashes to download
|
|
peers *peerSet // Set of active peers from which download can proceed
|
|
|
|
stateDB ethdb.Database // Database to state sync into (and deduplicate via)
|
|
stateBloom *trie.SyncBloom // Bloom filter for fast trie node existence checks
|
|
|
|
// Statistics
|
|
syncStatsChainOrigin uint64 // Origin block number where syncing started at
|
|
syncStatsChainHeight uint64 // Highest block number known when syncing started
|
|
syncStatsState stateSyncStats
|
|
syncStatsLock sync.RWMutex // Lock protecting the sync stats fields
|
|
|
|
lightchain LightChain
|
|
blockchain BlockChain
|
|
|
|
// Callbacks
|
|
dropPeer peerDropFn // Drops a peer for misbehaving
|
|
|
|
// Status
|
|
synchroniseMock func(id string, hash common.Hash) error // Replacement for synchronise during testing
|
|
synchronising int32
|
|
notified int32
|
|
committed int32
|
|
ancientLimit uint64 // The maximum block number which can be regarded as ancient data.
|
|
|
|
// Channels
|
|
headerCh chan dataPack // [eth/62] Channel receiving inbound block headers
|
|
bodyCh chan dataPack // [eth/62] Channel receiving inbound block bodies
|
|
receiptCh chan dataPack // [eth/63] Channel receiving inbound receipts
|
|
bodyWakeCh chan bool // [eth/62] Channel to signal the block body fetcher of new tasks
|
|
receiptWakeCh chan bool // [eth/63] Channel to signal the receipt fetcher of new tasks
|
|
headerProcCh chan []*types.Header // [eth/62] Channel to feed the header processor new tasks
|
|
|
|
// for stateFetcher
|
|
stateSyncStart chan *stateSync
|
|
trackStateReq chan *stateReq
|
|
stateCh chan dataPack // [eth/63] Channel receiving inbound node state data
|
|
|
|
// Cancellation and termination
|
|
cancelPeer string // Identifier of the peer currently being used as the master (cancel on drop)
|
|
cancelCh chan struct{} // Channel to cancel mid-flight syncs
|
|
cancelLock sync.RWMutex // Lock to protect the cancel channel and peer in delivers
|
|
cancelWg sync.WaitGroup // Make sure all fetcher goroutines have exited.
|
|
|
|
quitCh chan struct{} // Quit channel to signal termination
|
|
quitLock sync.RWMutex // Lock to prevent double closes
|
|
|
|
// Testing hooks
|
|
syncInitHook func(uint64, uint64) // Method to call upon initiating a new sync run
|
|
bodyFetchHook func([]*types.Header) // Method to call upon starting a block body fetch
|
|
receiptFetchHook func([]*types.Header) // Method to call upon starting a receipt fetch
|
|
chainInsertHook func([]*fetchResult) // Method to call upon inserting a chain of blocks (possibly in multiple invocations)
|
|
}
|
|
|
|
// LightChain encapsulates functions required to synchronise a light chain.
|
|
type LightChain interface {
|
|
// HasHeader verifies a header's presence in the local chain.
|
|
HasHeader(common.Hash, uint64) bool
|
|
|
|
// GetHeaderByHash retrieves a header from the local chain.
|
|
GetHeaderByHash(common.Hash) *types.Header
|
|
|
|
// CurrentHeader retrieves the head header from the local chain.
|
|
CurrentHeader() *types.Header
|
|
|
|
// GetTd returns the total difficulty of a local block.
|
|
GetTd(common.Hash, uint64) *big.Int
|
|
|
|
// InsertHeaderChain inserts a batch of headers into the local chain.
|
|
InsertHeaderChain([]*types.Header, int) (int, error)
|
|
|
|
// Rollback removes a few recently added elements from the local chain.
|
|
Rollback([]common.Hash)
|
|
}
|
|
|
|
// BlockChain encapsulates functions required to sync a (full or fast) blockchain.
|
|
type BlockChain interface {
|
|
LightChain
|
|
|
|
// HasBlock verifies a block's presence in the local chain.
|
|
HasBlock(common.Hash, uint64) bool
|
|
|
|
// HasFastBlock verifies a fast block's presence in the local chain.
|
|
HasFastBlock(common.Hash, uint64) bool
|
|
|
|
// GetBlockByHash retrieves a block from the local chain.
|
|
GetBlockByHash(common.Hash) *types.Block
|
|
|
|
// CurrentBlock retrieves the head block from the local chain.
|
|
CurrentBlock() *types.Block
|
|
|
|
// CurrentFastBlock retrieves the head fast block from the local chain.
|
|
CurrentFastBlock() *types.Block
|
|
|
|
// FastSyncCommitHead directly commits the head block to a certain entity.
|
|
FastSyncCommitHead(common.Hash) error
|
|
|
|
// InsertChain inserts a batch of blocks into the local chain.
|
|
InsertChain(types.Blocks) (int, error)
|
|
|
|
// InsertReceiptChain inserts a batch of receipts into the local chain.
|
|
InsertReceiptChain(types.Blocks, []types.Receipts, uint64) (int, error)
|
|
}
|
|
|
|
// New creates a new downloader to fetch hashes and blocks from remote peers.
|
|
func New(checkpoint uint64, stateDb ethdb.Database, stateBloom *trie.SyncBloom, mux *event.TypeMux, chain BlockChain, lightchain LightChain, dropPeer peerDropFn) *Downloader {
|
|
if lightchain == nil {
|
|
lightchain = chain
|
|
}
|
|
dl := &Downloader{
|
|
stateDB: stateDb,
|
|
stateBloom: stateBloom,
|
|
mux: mux,
|
|
checkpoint: checkpoint,
|
|
queue: newQueue(),
|
|
peers: newPeerSet(),
|
|
rttEstimate: uint64(rttMaxEstimate),
|
|
rttConfidence: uint64(1000000),
|
|
blockchain: chain,
|
|
lightchain: lightchain,
|
|
dropPeer: dropPeer,
|
|
headerCh: make(chan dataPack, 1),
|
|
bodyCh: make(chan dataPack, 1),
|
|
receiptCh: make(chan dataPack, 1),
|
|
bodyWakeCh: make(chan bool, 1),
|
|
receiptWakeCh: make(chan bool, 1),
|
|
headerProcCh: make(chan []*types.Header, 1),
|
|
quitCh: make(chan struct{}),
|
|
stateCh: make(chan dataPack),
|
|
stateSyncStart: make(chan *stateSync),
|
|
syncStatsState: stateSyncStats{
|
|
processed: rawdb.ReadFastTrieProgress(stateDb),
|
|
},
|
|
trackStateReq: make(chan *stateReq),
|
|
}
|
|
go dl.qosTuner()
|
|
go dl.stateFetcher()
|
|
return dl
|
|
}
|
|
|
|
// Progress retrieves the synchronisation boundaries, specifically the origin
|
|
// block where synchronisation started at (may have failed/suspended); the block
|
|
// or header sync is currently at; and the latest known block which the sync targets.
|
|
//
|
|
// In addition, during the state download phase of fast synchronisation the number
|
|
// of processed and the total number of known states are also returned. Otherwise
|
|
// these are zero.
|
|
func (d *Downloader) Progress() ethereum.SyncProgress {
|
|
// Lock the current stats and return the progress
|
|
d.syncStatsLock.RLock()
|
|
defer d.syncStatsLock.RUnlock()
|
|
|
|
current := uint64(0)
|
|
mode := d.getMode()
|
|
switch {
|
|
case d.blockchain != nil && mode == FullSync:
|
|
current = d.blockchain.CurrentBlock().NumberU64()
|
|
case d.blockchain != nil && mode == FastSync:
|
|
current = d.blockchain.CurrentFastBlock().NumberU64()
|
|
case d.lightchain != nil:
|
|
current = d.lightchain.CurrentHeader().Number.Uint64()
|
|
default:
|
|
log.Error("Unknown downloader chain/mode combo", "light", d.lightchain != nil, "full", d.blockchain != nil, "mode", mode)
|
|
}
|
|
return ethereum.SyncProgress{
|
|
StartingBlock: d.syncStatsChainOrigin,
|
|
CurrentBlock: current,
|
|
HighestBlock: d.syncStatsChainHeight,
|
|
PulledStates: d.syncStatsState.processed,
|
|
KnownStates: d.syncStatsState.processed + d.syncStatsState.pending,
|
|
}
|
|
}
|
|
|
|
// Synchronising returns whether the downloader is currently retrieving blocks.
|
|
func (d *Downloader) Synchronising() bool {
|
|
return atomic.LoadInt32(&d.synchronising) > 0
|
|
}
|
|
|
|
// RegisterPeer injects a new download peer into the set of block source to be
|
|
// used for fetching hashes and blocks from.
|
|
func (d *Downloader) RegisterPeer(id string, version int, peer Peer) error {
|
|
logger := log.New("peer", id)
|
|
logger.Trace("Registering sync peer")
|
|
if err := d.peers.Register(newPeerConnection(id, version, peer, logger)); err != nil {
|
|
logger.Error("Failed to register sync peer", "err", err)
|
|
return err
|
|
}
|
|
d.qosReduceConfidence()
|
|
|
|
return nil
|
|
}
|
|
|
|
// RegisterLightPeer injects a light client peer, wrapping it so it appears as a regular peer.
|
|
func (d *Downloader) RegisterLightPeer(id string, version int, peer LightPeer) error {
|
|
return d.RegisterPeer(id, version, &lightPeerWrapper{peer})
|
|
}
|
|
|
|
// UnregisterPeer remove a peer from the known list, preventing any action from
|
|
// the specified peer. An effort is also made to return any pending fetches into
|
|
// the queue.
|
|
func (d *Downloader) UnregisterPeer(id string) error {
|
|
// Unregister the peer from the active peer set and revoke any fetch tasks
|
|
logger := log.New("peer", id)
|
|
logger.Trace("Unregistering sync peer")
|
|
if err := d.peers.Unregister(id); err != nil {
|
|
logger.Error("Failed to unregister sync peer", "err", err)
|
|
return err
|
|
}
|
|
d.queue.Revoke(id)
|
|
|
|
return nil
|
|
}
|
|
|
|
// Synchronise tries to sync up our local block chain with a remote peer, both
|
|
// adding various sanity checks as well as wrapping it with various log entries.
|
|
func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int, mode SyncMode) error {
|
|
err := d.synchronise(id, head, td, mode)
|
|
|
|
switch err {
|
|
case nil, errBusy, errCanceled:
|
|
return err
|
|
}
|
|
|
|
if errors.Is(err, errInvalidChain) || errors.Is(err, errBadPeer) || errors.Is(err, errTimeout) ||
|
|
errors.Is(err, errStallingPeer) || errors.Is(err, errUnsyncedPeer) || errors.Is(err, errEmptyHeaderSet) ||
|
|
errors.Is(err, errPeersUnavailable) || errors.Is(err, errTooOld) || errors.Is(err, errInvalidAncestor) {
|
|
log.Warn("Synchronisation failed, dropping peer", "peer", id, "err", err)
|
|
if d.dropPeer == nil {
|
|
// The dropPeer method is nil when `--copydb` is used for a local copy.
|
|
// Timeouts can occur if e.g. compaction hits at the wrong time, and can be ignored
|
|
log.Warn("Downloader wants to drop peer, but peerdrop-function is not set", "peer", id)
|
|
} else {
|
|
d.dropPeer(id)
|
|
}
|
|
return err
|
|
}
|
|
log.Warn("Synchronisation failed, retrying", "err", err)
|
|
return err
|
|
}
|
|
|
|
// synchronise will select the peer and use it for synchronising. If an empty string is given
|
|
// it will use the best peer possible and synchronize if its TD is higher than our own. If any of the
|
|
// checks fail an error will be returned. This method is synchronous
|
|
func (d *Downloader) synchronise(id string, hash common.Hash, td *big.Int, mode SyncMode) error {
|
|
// Mock out the synchronisation if testing
|
|
if d.synchroniseMock != nil {
|
|
return d.synchroniseMock(id, hash)
|
|
}
|
|
// Make sure only one goroutine is ever allowed past this point at once
|
|
if !atomic.CompareAndSwapInt32(&d.synchronising, 0, 1) {
|
|
return errBusy
|
|
}
|
|
defer atomic.StoreInt32(&d.synchronising, 0)
|
|
|
|
// Post a user notification of the sync (only once per session)
|
|
if atomic.CompareAndSwapInt32(&d.notified, 0, 1) {
|
|
log.Info("Block synchronisation started")
|
|
}
|
|
// If we are already full syncing, but have a fast-sync bloom filter laying
|
|
// around, make sure it doesn't use memory any more. This is a special case
|
|
// when the user attempts to fast sync a new empty network.
|
|
if mode == FullSync && d.stateBloom != nil {
|
|
d.stateBloom.Close()
|
|
}
|
|
// Reset the queue, peer set and wake channels to clean any internal leftover state
|
|
d.queue.Reset()
|
|
d.peers.Reset()
|
|
|
|
for _, ch := range []chan bool{d.bodyWakeCh, d.receiptWakeCh} {
|
|
select {
|
|
case <-ch:
|
|
default:
|
|
}
|
|
}
|
|
for _, ch := range []chan dataPack{d.headerCh, d.bodyCh, d.receiptCh} {
|
|
for empty := false; !empty; {
|
|
select {
|
|
case <-ch:
|
|
default:
|
|
empty = true
|
|
}
|
|
}
|
|
}
|
|
for empty := false; !empty; {
|
|
select {
|
|
case <-d.headerProcCh:
|
|
default:
|
|
empty = true
|
|
}
|
|
}
|
|
// Create cancel channel for aborting mid-flight and mark the master peer
|
|
d.cancelLock.Lock()
|
|
d.cancelCh = make(chan struct{})
|
|
d.cancelPeer = id
|
|
d.cancelLock.Unlock()
|
|
|
|
defer d.Cancel() // No matter what, we can't leave the cancel channel open
|
|
|
|
// Atomically set the requested sync mode
|
|
atomic.StoreUint32(&d.mode, uint32(mode))
|
|
|
|
// Retrieve the origin peer and initiate the downloading process
|
|
p := d.peers.Peer(id)
|
|
if p == nil {
|
|
return errUnknownPeer
|
|
}
|
|
return d.syncWithPeer(p, hash, td)
|
|
}
|
|
|
|
func (d *Downloader) getMode() SyncMode {
|
|
return SyncMode(atomic.LoadUint32(&d.mode))
|
|
}
|
|
|
|
// syncWithPeer starts a block synchronization based on the hash chain from the
|
|
// specified peer and head hash.
|
|
func (d *Downloader) syncWithPeer(p *peerConnection, hash common.Hash, td *big.Int) (err error) {
|
|
d.mux.Post(StartEvent{})
|
|
defer func() {
|
|
// reset on error
|
|
if err != nil {
|
|
d.mux.Post(FailedEvent{err})
|
|
} else {
|
|
latest := d.lightchain.CurrentHeader()
|
|
d.mux.Post(DoneEvent{latest})
|
|
}
|
|
}()
|
|
if p.version < 62 {
|
|
return errTooOld
|
|
}
|
|
mode := d.getMode()
|
|
|
|
log.Debug("Synchronising with the network", "peer", p.id, "eth", p.version, "head", hash, "td", td, "mode", mode)
|
|
defer func(start time.Time) {
|
|
log.Debug("Synchronisation terminated", "elapsed", common.PrettyDuration(time.Since(start)))
|
|
}(time.Now())
|
|
|
|
// Look up the sync boundaries: the common ancestor and the target block
|
|
latest, err := d.fetchHeight(p)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
height := latest.Number.Uint64()
|
|
|
|
origin, err := d.findAncestor(p, latest)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
d.syncStatsLock.Lock()
|
|
if d.syncStatsChainHeight <= origin || d.syncStatsChainOrigin > origin {
|
|
d.syncStatsChainOrigin = origin
|
|
}
|
|
d.syncStatsChainHeight = height
|
|
d.syncStatsLock.Unlock()
|
|
|
|
// Ensure our origin point is below any fast sync pivot point
|
|
pivot := uint64(0)
|
|
if mode == FastSync {
|
|
if height <= uint64(fsMinFullBlocks) {
|
|
origin = 0
|
|
} else {
|
|
pivot = height - uint64(fsMinFullBlocks)
|
|
if pivot <= origin {
|
|
origin = pivot - 1
|
|
}
|
|
}
|
|
}
|
|
d.committed = 1
|
|
if mode == FastSync && pivot != 0 {
|
|
d.committed = 0
|
|
}
|
|
if mode == FastSync {
|
|
// Set the ancient data limitation.
|
|
// If we are running fast sync, all block data older than ancientLimit will be
|
|
// written to the ancient store. More recent data will be written to the active
|
|
// database and will wait for the freezer to migrate.
|
|
//
|
|
// If there is a checkpoint available, then calculate the ancientLimit through
|
|
// that. Otherwise calculate the ancient limit through the advertised height
|
|
// of the remote peer.
|
|
//
|
|
// The reason for picking checkpoint first is that a malicious peer can give us
|
|
// a fake (very high) height, forcing the ancient limit to also be very high.
|
|
// The peer would start to feed us valid blocks until head, resulting in all of
|
|
// the blocks might be written into the ancient store. A following mini-reorg
|
|
// could cause issues.
|
|
if d.checkpoint != 0 && d.checkpoint > maxForkAncestry+1 {
|
|
d.ancientLimit = d.checkpoint
|
|
} else if height > maxForkAncestry+1 {
|
|
d.ancientLimit = height - maxForkAncestry - 1
|
|
}
|
|
frozen, _ := d.stateDB.Ancients() // Ignore the error here since light client can also hit here.
|
|
// If a part of blockchain data has already been written into active store,
|
|
// disable the ancient style insertion explicitly.
|
|
if origin >= frozen && frozen != 0 {
|
|
d.ancientLimit = 0
|
|
log.Info("Disabling direct-ancient mode", "origin", origin, "ancient", frozen-1)
|
|
} else if d.ancientLimit > 0 {
|
|
log.Debug("Enabling direct-ancient mode", "ancient", d.ancientLimit)
|
|
}
|
|
// Rewind the ancient store and blockchain if reorg happens.
|
|
if origin+1 < frozen {
|
|
var hashes []common.Hash
|
|
for i := origin + 1; i < d.lightchain.CurrentHeader().Number.Uint64(); i++ {
|
|
hashes = append(hashes, rawdb.ReadCanonicalHash(d.stateDB, i))
|
|
}
|
|
d.lightchain.Rollback(hashes)
|
|
}
|
|
}
|
|
// Initiate the sync using a concurrent header and content retrieval algorithm
|
|
d.queue.Prepare(origin+1, mode)
|
|
if d.syncInitHook != nil {
|
|
d.syncInitHook(origin, height)
|
|
}
|
|
fetchers := []func() error{
|
|
func() error { return d.fetchHeaders(p, origin+1, pivot) }, // Headers are always retrieved
|
|
func() error { return d.fetchBodies(origin + 1) }, // Bodies are retrieved during normal and fast sync
|
|
func() error { return d.fetchReceipts(origin + 1) }, // Receipts are retrieved during fast sync
|
|
func() error { return d.processHeaders(origin+1, pivot, td) },
|
|
}
|
|
if mode == FastSync {
|
|
fetchers = append(fetchers, func() error { return d.processFastSyncContent(latest) })
|
|
} else if mode == FullSync {
|
|
fetchers = append(fetchers, d.processFullSyncContent)
|
|
}
|
|
return d.spawnSync(fetchers)
|
|
}
|
|
|
|
// spawnSync runs d.process and all given fetcher functions to completion in
|
|
// separate goroutines, returning the first error that appears.
|
|
func (d *Downloader) spawnSync(fetchers []func() error) error {
|
|
errc := make(chan error, len(fetchers))
|
|
d.cancelWg.Add(len(fetchers))
|
|
for _, fn := range fetchers {
|
|
fn := fn
|
|
go func() { defer d.cancelWg.Done(); errc <- fn() }()
|
|
}
|
|
// Wait for the first error, then terminate the others.
|
|
var err error
|
|
for i := 0; i < len(fetchers); i++ {
|
|
if i == len(fetchers)-1 {
|
|
// Close the queue when all fetchers have exited.
|
|
// This will cause the block processor to end when
|
|
// it has processed the queue.
|
|
d.queue.Close()
|
|
}
|
|
if err = <-errc; err != nil && err != errCanceled {
|
|
break
|
|
}
|
|
}
|
|
d.queue.Close()
|
|
d.Cancel()
|
|
return err
|
|
}
|
|
|
|
// cancel aborts all of the operations and resets the queue. However, cancel does
|
|
// not wait for the running download goroutines to finish. This method should be
|
|
// used when cancelling the downloads from inside the downloader.
|
|
func (d *Downloader) cancel() {
|
|
// Close the current cancel channel
|
|
d.cancelLock.Lock()
|
|
defer d.cancelLock.Unlock()
|
|
|
|
if d.cancelCh != nil {
|
|
select {
|
|
case <-d.cancelCh:
|
|
// Channel was already closed
|
|
default:
|
|
close(d.cancelCh)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Cancel aborts all of the operations and waits for all download goroutines to
|
|
// finish before returning.
|
|
func (d *Downloader) Cancel() {
|
|
d.cancel()
|
|
d.cancelWg.Wait()
|
|
|
|
d.ancientLimit = 0
|
|
log.Debug("Reset ancient limit to zero")
|
|
}
|
|
|
|
// Terminate interrupts the downloader, canceling all pending operations.
|
|
// The downloader cannot be reused after calling Terminate.
|
|
func (d *Downloader) Terminate() {
|
|
// Close the termination channel (make sure double close is allowed)
|
|
d.quitLock.Lock()
|
|
select {
|
|
case <-d.quitCh:
|
|
default:
|
|
close(d.quitCh)
|
|
}
|
|
d.quitLock.Unlock()
|
|
|
|
// Cancel any pending download requests
|
|
d.Cancel()
|
|
}
|
|
|
|
// fetchHeight retrieves the head header of the remote peer to aid in estimating
|
|
// the total time a pending synchronisation would take.
|
|
func (d *Downloader) fetchHeight(p *peerConnection) (*types.Header, error) {
|
|
p.log.Debug("Retrieving remote chain height")
|
|
|
|
// Request the advertised remote head block and wait for the response
|
|
head, _ := p.peer.Head()
|
|
go p.peer.RequestHeadersByHash(head, 1, 0, false)
|
|
|
|
ttl := d.requestTTL()
|
|
timeout := time.After(ttl)
|
|
mode := d.getMode()
|
|
for {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return nil, errCanceled
|
|
|
|
case packet := <-d.headerCh:
|
|
// Discard anything not from the origin peer
|
|
if packet.PeerId() != p.id {
|
|
log.Debug("Received headers from incorrect peer", "peer", packet.PeerId())
|
|
break
|
|
}
|
|
// Make sure the peer actually gave something valid
|
|
headers := packet.(*headerPack).headers
|
|
if len(headers) != 1 {
|
|
p.log.Debug("Multiple headers for single request", "headers", len(headers))
|
|
return nil, fmt.Errorf("%w: multiple headers (%d) for single request", errBadPeer, len(headers))
|
|
}
|
|
head := headers[0]
|
|
if (mode == FastSync || mode == LightSync) && head.Number.Uint64() < d.checkpoint {
|
|
p.log.Warn("Remote head below checkpoint", "number", head.Number, "hash", head.Hash())
|
|
return nil, errUnsyncedPeer
|
|
}
|
|
p.log.Debug("Remote head header identified", "number", head.Number, "hash", head.Hash())
|
|
return head, nil
|
|
|
|
case <-timeout:
|
|
p.log.Debug("Waiting for head header timed out", "elapsed", ttl)
|
|
return nil, errTimeout
|
|
|
|
case <-d.bodyCh:
|
|
case <-d.receiptCh:
|
|
// Out of bounds delivery, ignore
|
|
}
|
|
}
|
|
}
|
|
|
|
// calculateRequestSpan calculates what headers to request from a peer when trying to determine the
|
|
// common ancestor.
|
|
// It returns parameters to be used for peer.RequestHeadersByNumber:
|
|
// from - starting block number
|
|
// count - number of headers to request
|
|
// skip - number of headers to skip
|
|
// and also returns 'max', the last block which is expected to be returned by the remote peers,
|
|
// given the (from,count,skip)
|
|
func calculateRequestSpan(remoteHeight, localHeight uint64) (int64, int, int, uint64) {
|
|
var (
|
|
from int
|
|
count int
|
|
MaxCount = MaxHeaderFetch / 16
|
|
)
|
|
// requestHead is the highest block that we will ask for. If requestHead is not offset,
|
|
// the highest block that we will get is 16 blocks back from head, which means we
|
|
// will fetch 14 or 15 blocks unnecessarily in the case the height difference
|
|
// between us and the peer is 1-2 blocks, which is most common
|
|
requestHead := int(remoteHeight) - 1
|
|
if requestHead < 0 {
|
|
requestHead = 0
|
|
}
|
|
// requestBottom is the lowest block we want included in the query
|
|
// Ideally, we want to include the one just below our own head
|
|
requestBottom := int(localHeight - 1)
|
|
if requestBottom < 0 {
|
|
requestBottom = 0
|
|
}
|
|
totalSpan := requestHead - requestBottom
|
|
span := 1 + totalSpan/MaxCount
|
|
if span < 2 {
|
|
span = 2
|
|
}
|
|
if span > 16 {
|
|
span = 16
|
|
}
|
|
|
|
count = 1 + totalSpan/span
|
|
if count > MaxCount {
|
|
count = MaxCount
|
|
}
|
|
if count < 2 {
|
|
count = 2
|
|
}
|
|
from = requestHead - (count-1)*span
|
|
if from < 0 {
|
|
from = 0
|
|
}
|
|
max := from + (count-1)*span
|
|
return int64(from), count, span - 1, uint64(max)
|
|
}
|
|
|
|
// findAncestor tries to locate the common ancestor link of the local chain and
|
|
// a remote peers blockchain. In the general case when our node was in sync and
|
|
// on the correct chain, checking the top N links should already get us a match.
|
|
// In the rare scenario when we ended up on a long reorganisation (i.e. none of
|
|
// the head links match), we do a binary search to find the common ancestor.
|
|
func (d *Downloader) findAncestor(p *peerConnection, remoteHeader *types.Header) (uint64, error) {
|
|
// Figure out the valid ancestor range to prevent rewrite attacks
|
|
var (
|
|
floor = int64(-1)
|
|
localHeight uint64
|
|
remoteHeight = remoteHeader.Number.Uint64()
|
|
)
|
|
mode := d.getMode()
|
|
switch mode {
|
|
case FullSync:
|
|
localHeight = d.blockchain.CurrentBlock().NumberU64()
|
|
case FastSync:
|
|
localHeight = d.blockchain.CurrentFastBlock().NumberU64()
|
|
default:
|
|
localHeight = d.lightchain.CurrentHeader().Number.Uint64()
|
|
}
|
|
p.log.Debug("Looking for common ancestor", "local", localHeight, "remote", remoteHeight)
|
|
|
|
// Recap floor value for binary search
|
|
if localHeight >= maxForkAncestry {
|
|
// We're above the max reorg threshold, find the earliest fork point
|
|
floor = int64(localHeight - maxForkAncestry)
|
|
}
|
|
// If we're doing a light sync, ensure the floor doesn't go below the CHT, as
|
|
// all headers before that point will be missing.
|
|
if mode == LightSync {
|
|
// If we don't know the current CHT position, find it
|
|
if d.genesis == 0 {
|
|
header := d.lightchain.CurrentHeader()
|
|
for header != nil {
|
|
d.genesis = header.Number.Uint64()
|
|
if floor >= int64(d.genesis)-1 {
|
|
break
|
|
}
|
|
header = d.lightchain.GetHeaderByHash(header.ParentHash)
|
|
}
|
|
}
|
|
// We already know the "genesis" block number, cap floor to that
|
|
if floor < int64(d.genesis)-1 {
|
|
floor = int64(d.genesis) - 1
|
|
}
|
|
}
|
|
|
|
from, count, skip, max := calculateRequestSpan(remoteHeight, localHeight)
|
|
|
|
p.log.Trace("Span searching for common ancestor", "count", count, "from", from, "skip", skip)
|
|
go p.peer.RequestHeadersByNumber(uint64(from), count, skip, false)
|
|
|
|
// Wait for the remote response to the head fetch
|
|
number, hash := uint64(0), common.Hash{}
|
|
|
|
ttl := d.requestTTL()
|
|
timeout := time.After(ttl)
|
|
|
|
for finished := false; !finished; {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return 0, errCanceled
|
|
|
|
case packet := <-d.headerCh:
|
|
// Discard anything not from the origin peer
|
|
if packet.PeerId() != p.id {
|
|
log.Debug("Received headers from incorrect peer", "peer", packet.PeerId())
|
|
break
|
|
}
|
|
// Make sure the peer actually gave something valid
|
|
headers := packet.(*headerPack).headers
|
|
if len(headers) == 0 {
|
|
p.log.Warn("Empty head header set")
|
|
return 0, errEmptyHeaderSet
|
|
}
|
|
// Make sure the peer's reply conforms to the request
|
|
for i, header := range headers {
|
|
expectNumber := from + int64(i)*int64(skip+1)
|
|
if number := header.Number.Int64(); number != expectNumber {
|
|
p.log.Warn("Head headers broke chain ordering", "index", i, "requested", expectNumber, "received", number)
|
|
return 0, fmt.Errorf("%w: %v", errInvalidChain, errors.New("head headers broke chain ordering"))
|
|
}
|
|
}
|
|
// Check if a common ancestor was found
|
|
finished = true
|
|
for i := len(headers) - 1; i >= 0; i-- {
|
|
// Skip any headers that underflow/overflow our requested set
|
|
if headers[i].Number.Int64() < from || headers[i].Number.Uint64() > max {
|
|
continue
|
|
}
|
|
// Otherwise check if we already know the header or not
|
|
h := headers[i].Hash()
|
|
n := headers[i].Number.Uint64()
|
|
|
|
var known bool
|
|
switch mode {
|
|
case FullSync:
|
|
known = d.blockchain.HasBlock(h, n)
|
|
case FastSync:
|
|
known = d.blockchain.HasFastBlock(h, n)
|
|
default:
|
|
known = d.lightchain.HasHeader(h, n)
|
|
}
|
|
if known {
|
|
number, hash = n, h
|
|
break
|
|
}
|
|
}
|
|
|
|
case <-timeout:
|
|
p.log.Debug("Waiting for head header timed out", "elapsed", ttl)
|
|
return 0, errTimeout
|
|
|
|
case <-d.bodyCh:
|
|
case <-d.receiptCh:
|
|
// Out of bounds delivery, ignore
|
|
}
|
|
}
|
|
// If the head fetch already found an ancestor, return
|
|
if hash != (common.Hash{}) {
|
|
if int64(number) <= floor {
|
|
p.log.Warn("Ancestor below allowance", "number", number, "hash", hash, "allowance", floor)
|
|
return 0, errInvalidAncestor
|
|
}
|
|
p.log.Debug("Found common ancestor", "number", number, "hash", hash)
|
|
return number, nil
|
|
}
|
|
// Ancestor not found, we need to binary search over our chain
|
|
start, end := uint64(0), remoteHeight
|
|
if floor > 0 {
|
|
start = uint64(floor)
|
|
}
|
|
p.log.Trace("Binary searching for common ancestor", "start", start, "end", end)
|
|
|
|
for start+1 < end {
|
|
// Split our chain interval in two, and request the hash to cross check
|
|
check := (start + end) / 2
|
|
|
|
ttl := d.requestTTL()
|
|
timeout := time.After(ttl)
|
|
|
|
go p.peer.RequestHeadersByNumber(check, 1, 0, false)
|
|
|
|
// Wait until a reply arrives to this request
|
|
for arrived := false; !arrived; {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return 0, errCanceled
|
|
|
|
case packer := <-d.headerCh:
|
|
// Discard anything not from the origin peer
|
|
if packer.PeerId() != p.id {
|
|
log.Debug("Received headers from incorrect peer", "peer", packer.PeerId())
|
|
break
|
|
}
|
|
// Make sure the peer actually gave something valid
|
|
headers := packer.(*headerPack).headers
|
|
if len(headers) != 1 {
|
|
p.log.Debug("Multiple headers for single request", "headers", len(headers))
|
|
return 0, fmt.Errorf("%w: multiple headers (%d) for single request", errBadPeer, len(headers))
|
|
}
|
|
arrived = true
|
|
|
|
// Modify the search interval based on the response
|
|
h := headers[0].Hash()
|
|
n := headers[0].Number.Uint64()
|
|
|
|
var known bool
|
|
switch mode {
|
|
case FullSync:
|
|
known = d.blockchain.HasBlock(h, n)
|
|
case FastSync:
|
|
known = d.blockchain.HasFastBlock(h, n)
|
|
default:
|
|
known = d.lightchain.HasHeader(h, n)
|
|
}
|
|
if !known {
|
|
end = check
|
|
break
|
|
}
|
|
header := d.lightchain.GetHeaderByHash(h) // Independent of sync mode, header surely exists
|
|
if header.Number.Uint64() != check {
|
|
p.log.Debug("Received non requested header", "number", header.Number, "hash", header.Hash(), "request", check)
|
|
return 0, fmt.Errorf("%w: non-requested header (%d)", errBadPeer, header.Number)
|
|
}
|
|
start = check
|
|
hash = h
|
|
|
|
case <-timeout:
|
|
p.log.Debug("Waiting for search header timed out", "elapsed", ttl)
|
|
return 0, errTimeout
|
|
|
|
case <-d.bodyCh:
|
|
case <-d.receiptCh:
|
|
// Out of bounds delivery, ignore
|
|
}
|
|
}
|
|
}
|
|
// Ensure valid ancestry and return
|
|
if int64(start) <= floor {
|
|
p.log.Warn("Ancestor below allowance", "number", start, "hash", hash, "allowance", floor)
|
|
return 0, errInvalidAncestor
|
|
}
|
|
p.log.Debug("Found common ancestor", "number", start, "hash", hash)
|
|
return start, nil
|
|
}
|
|
|
|
// fetchHeaders keeps retrieving headers concurrently from the number
|
|
// requested, until no more are returned, potentially throttling on the way. To
|
|
// facilitate concurrency but still protect against malicious nodes sending bad
|
|
// headers, we construct a header chain skeleton using the "origin" peer we are
|
|
// syncing with, and fill in the missing headers using anyone else. Headers from
|
|
// other peers are only accepted if they map cleanly to the skeleton. If no one
|
|
// can fill in the skeleton - not even the origin peer - it's assumed invalid and
|
|
// the origin is dropped.
|
|
func (d *Downloader) fetchHeaders(p *peerConnection, from uint64, pivot uint64) error {
|
|
p.log.Debug("Directing header downloads", "origin", from)
|
|
defer p.log.Debug("Header download terminated")
|
|
|
|
// Create a timeout timer, and the associated header fetcher
|
|
skeleton := true // Skeleton assembly phase or finishing up
|
|
request := time.Now() // time of the last skeleton fetch request
|
|
timeout := time.NewTimer(0) // timer to dump a non-responsive active peer
|
|
<-timeout.C // timeout channel should be initially empty
|
|
defer timeout.Stop()
|
|
|
|
var ttl time.Duration
|
|
getHeaders := func(from uint64) {
|
|
request = time.Now()
|
|
|
|
ttl = d.requestTTL()
|
|
timeout.Reset(ttl)
|
|
|
|
if skeleton {
|
|
p.log.Trace("Fetching skeleton headers", "count", MaxHeaderFetch, "from", from)
|
|
go p.peer.RequestHeadersByNumber(from+uint64(MaxHeaderFetch)-1, MaxSkeletonSize, MaxHeaderFetch-1, false)
|
|
} else {
|
|
p.log.Trace("Fetching full headers", "count", MaxHeaderFetch, "from", from)
|
|
go p.peer.RequestHeadersByNumber(from, MaxHeaderFetch, 0, false)
|
|
}
|
|
}
|
|
// Start pulling the header chain skeleton until all is done
|
|
ancestor := from
|
|
getHeaders(from)
|
|
|
|
mode := d.getMode()
|
|
for {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
|
|
case packet := <-d.headerCh:
|
|
// Make sure the active peer is giving us the skeleton headers
|
|
if packet.PeerId() != p.id {
|
|
log.Debug("Received skeleton from incorrect peer", "peer", packet.PeerId())
|
|
break
|
|
}
|
|
headerReqTimer.UpdateSince(request)
|
|
timeout.Stop()
|
|
|
|
// If the skeleton's finished, pull any remaining head headers directly from the origin
|
|
if packet.Items() == 0 && skeleton {
|
|
skeleton = false
|
|
getHeaders(from)
|
|
continue
|
|
}
|
|
// If no more headers are inbound, notify the content fetchers and return
|
|
if packet.Items() == 0 {
|
|
// Don't abort header fetches while the pivot is downloading
|
|
if atomic.LoadInt32(&d.committed) == 0 && pivot <= from {
|
|
p.log.Debug("No headers, waiting for pivot commit")
|
|
select {
|
|
case <-time.After(fsHeaderContCheck):
|
|
getHeaders(from)
|
|
continue
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
}
|
|
}
|
|
// Pivot done (or not in fast sync) and no more headers, terminate the process
|
|
p.log.Debug("No more headers available")
|
|
select {
|
|
case d.headerProcCh <- nil:
|
|
return nil
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
}
|
|
}
|
|
headers := packet.(*headerPack).headers
|
|
|
|
// If we received a skeleton batch, resolve internals concurrently
|
|
if skeleton {
|
|
filled, proced, err := d.fillHeaderSkeleton(from, headers)
|
|
if err != nil {
|
|
p.log.Debug("Skeleton chain invalid", "err", err)
|
|
return fmt.Errorf("%w: %v", errInvalidChain, err)
|
|
}
|
|
headers = filled[proced:]
|
|
from += uint64(proced)
|
|
} else {
|
|
// If we're closing in on the chain head, but haven't yet reached it, delay
|
|
// the last few headers so mini reorgs on the head don't cause invalid hash
|
|
// chain errors.
|
|
if n := len(headers); n > 0 {
|
|
// Retrieve the current head we're at
|
|
var head uint64
|
|
if mode == LightSync {
|
|
head = d.lightchain.CurrentHeader().Number.Uint64()
|
|
} else {
|
|
head = d.blockchain.CurrentFastBlock().NumberU64()
|
|
if full := d.blockchain.CurrentBlock().NumberU64(); head < full {
|
|
head = full
|
|
}
|
|
}
|
|
// If the head is below the common ancestor, we're actually deduplicating
|
|
// already existing chain segments, so use the ancestor as the fake head.
|
|
// Otherwise we might end up delaying header deliveries pointlessly.
|
|
if head < ancestor {
|
|
head = ancestor
|
|
}
|
|
// If the head is way older than this batch, delay the last few headers
|
|
if head+uint64(reorgProtThreshold) < headers[n-1].Number.Uint64() {
|
|
delay := reorgProtHeaderDelay
|
|
if delay > n {
|
|
delay = n
|
|
}
|
|
headers = headers[:n-delay]
|
|
}
|
|
}
|
|
}
|
|
// Insert all the new headers and fetch the next batch
|
|
if len(headers) > 0 {
|
|
p.log.Trace("Scheduling new headers", "count", len(headers), "from", from)
|
|
select {
|
|
case d.headerProcCh <- headers:
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
}
|
|
from += uint64(len(headers))
|
|
getHeaders(from)
|
|
} else {
|
|
// No headers delivered, or all of them being delayed, sleep a bit and retry
|
|
p.log.Trace("All headers delayed, waiting")
|
|
select {
|
|
case <-time.After(fsHeaderContCheck):
|
|
getHeaders(from)
|
|
continue
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
}
|
|
}
|
|
|
|
case <-timeout.C:
|
|
if d.dropPeer == nil {
|
|
// The dropPeer method is nil when `--copydb` is used for a local copy.
|
|
// Timeouts can occur if e.g. compaction hits at the wrong time, and can be ignored
|
|
p.log.Warn("Downloader wants to drop peer, but peerdrop-function is not set", "peer", p.id)
|
|
break
|
|
}
|
|
// Header retrieval timed out, consider the peer bad and drop
|
|
p.log.Debug("Header request timed out", "elapsed", ttl)
|
|
headerTimeoutMeter.Mark(1)
|
|
d.dropPeer(p.id)
|
|
|
|
// Finish the sync gracefully instead of dumping the gathered data though
|
|
for _, ch := range []chan bool{d.bodyWakeCh, d.receiptWakeCh} {
|
|
select {
|
|
case ch <- false:
|
|
case <-d.cancelCh:
|
|
}
|
|
}
|
|
select {
|
|
case d.headerProcCh <- nil:
|
|
case <-d.cancelCh:
|
|
}
|
|
return fmt.Errorf("%w: header request timed out", errBadPeer)
|
|
}
|
|
}
|
|
}
|
|
|
|
// fillHeaderSkeleton concurrently retrieves headers from all our available peers
|
|
// and maps them to the provided skeleton header chain.
|
|
//
|
|
// Any partial results from the beginning of the skeleton is (if possible) forwarded
|
|
// immediately to the header processor to keep the rest of the pipeline full even
|
|
// in the case of header stalls.
|
|
//
|
|
// The method returns the entire filled skeleton and also the number of headers
|
|
// already forwarded for processing.
|
|
func (d *Downloader) fillHeaderSkeleton(from uint64, skeleton []*types.Header) ([]*types.Header, int, error) {
|
|
log.Debug("Filling up skeleton", "from", from)
|
|
d.queue.ScheduleSkeleton(from, skeleton)
|
|
|
|
var (
|
|
deliver = func(packet dataPack) (int, error) {
|
|
pack := packet.(*headerPack)
|
|
return d.queue.DeliverHeaders(pack.peerID, pack.headers, d.headerProcCh)
|
|
}
|
|
expire = func() map[string]int { return d.queue.ExpireHeaders(d.requestTTL()) }
|
|
throttle = func() bool { return false }
|
|
reserve = func(p *peerConnection, count int) (*fetchRequest, bool, error) {
|
|
return d.queue.ReserveHeaders(p, count), false, nil
|
|
}
|
|
fetch = func(p *peerConnection, req *fetchRequest) error { return p.FetchHeaders(req.From, MaxHeaderFetch) }
|
|
capacity = func(p *peerConnection) int { return p.HeaderCapacity(d.requestRTT()) }
|
|
setIdle = func(p *peerConnection, accepted int) { p.SetHeadersIdle(accepted) }
|
|
)
|
|
err := d.fetchParts(d.headerCh, deliver, d.queue.headerContCh, expire,
|
|
d.queue.PendingHeaders, d.queue.InFlightHeaders, throttle, reserve,
|
|
nil, fetch, d.queue.CancelHeaders, capacity, d.peers.HeaderIdlePeers, setIdle, "headers")
|
|
|
|
log.Debug("Skeleton fill terminated", "err", err)
|
|
|
|
filled, proced := d.queue.RetrieveHeaders()
|
|
return filled, proced, err
|
|
}
|
|
|
|
// fetchBodies iteratively downloads the scheduled block bodies, taking any
|
|
// available peers, reserving a chunk of blocks for each, waiting for delivery
|
|
// and also periodically checking for timeouts.
|
|
func (d *Downloader) fetchBodies(from uint64) error {
|
|
log.Debug("Downloading block bodies", "origin", from)
|
|
|
|
var (
|
|
deliver = func(packet dataPack) (int, error) {
|
|
pack := packet.(*bodyPack)
|
|
return d.queue.DeliverBodies(pack.peerID, pack.transactions, pack.uncles)
|
|
}
|
|
expire = func() map[string]int { return d.queue.ExpireBodies(d.requestTTL()) }
|
|
fetch = func(p *peerConnection, req *fetchRequest) error { return p.FetchBodies(req) }
|
|
capacity = func(p *peerConnection) int { return p.BlockCapacity(d.requestRTT()) }
|
|
setIdle = func(p *peerConnection, accepted int) { p.SetBodiesIdle(accepted) }
|
|
)
|
|
err := d.fetchParts(d.bodyCh, deliver, d.bodyWakeCh, expire,
|
|
d.queue.PendingBlocks, d.queue.InFlightBlocks, d.queue.ShouldThrottleBlocks, d.queue.ReserveBodies,
|
|
d.bodyFetchHook, fetch, d.queue.CancelBodies, capacity, d.peers.BodyIdlePeers, setIdle, "bodies")
|
|
|
|
log.Debug("Block body download terminated", "err", err)
|
|
return err
|
|
}
|
|
|
|
// fetchReceipts iteratively downloads the scheduled block receipts, taking any
|
|
// available peers, reserving a chunk of receipts for each, waiting for delivery
|
|
// and also periodically checking for timeouts.
|
|
func (d *Downloader) fetchReceipts(from uint64) error {
|
|
log.Debug("Downloading transaction receipts", "origin", from)
|
|
|
|
var (
|
|
deliver = func(packet dataPack) (int, error) {
|
|
pack := packet.(*receiptPack)
|
|
return d.queue.DeliverReceipts(pack.peerID, pack.receipts)
|
|
}
|
|
expire = func() map[string]int { return d.queue.ExpireReceipts(d.requestTTL()) }
|
|
fetch = func(p *peerConnection, req *fetchRequest) error { return p.FetchReceipts(req) }
|
|
capacity = func(p *peerConnection) int { return p.ReceiptCapacity(d.requestRTT()) }
|
|
setIdle = func(p *peerConnection, accepted int) { p.SetReceiptsIdle(accepted) }
|
|
)
|
|
err := d.fetchParts(d.receiptCh, deliver, d.receiptWakeCh, expire,
|
|
d.queue.PendingReceipts, d.queue.InFlightReceipts, d.queue.ShouldThrottleReceipts, d.queue.ReserveReceipts,
|
|
d.receiptFetchHook, fetch, d.queue.CancelReceipts, capacity, d.peers.ReceiptIdlePeers, setIdle, "receipts")
|
|
|
|
log.Debug("Transaction receipt download terminated", "err", err)
|
|
return err
|
|
}
|
|
|
|
// fetchParts iteratively downloads scheduled block parts, taking any available
|
|
// peers, reserving a chunk of fetch requests for each, waiting for delivery and
|
|
// also periodically checking for timeouts.
|
|
//
|
|
// As the scheduling/timeout logic mostly is the same for all downloaded data
|
|
// types, this method is used by each for data gathering and is instrumented with
|
|
// various callbacks to handle the slight differences between processing them.
|
|
//
|
|
// The instrumentation parameters:
|
|
// - errCancel: error type to return if the fetch operation is cancelled (mostly makes logging nicer)
|
|
// - deliveryCh: channel from which to retrieve downloaded data packets (merged from all concurrent peers)
|
|
// - deliver: processing callback to deliver data packets into type specific download queues (usually within `queue`)
|
|
// - wakeCh: notification channel for waking the fetcher when new tasks are available (or sync completed)
|
|
// - expire: task callback method to abort requests that took too long and return the faulty peers (traffic shaping)
|
|
// - pending: task callback for the number of requests still needing download (detect completion/non-completability)
|
|
// - inFlight: task callback for the number of in-progress requests (wait for all active downloads to finish)
|
|
// - throttle: task callback to check if the processing queue is full and activate throttling (bound memory use)
|
|
// - reserve: task callback to reserve new download tasks to a particular peer (also signals partial completions)
|
|
// - fetchHook: tester callback to notify of new tasks being initiated (allows testing the scheduling logic)
|
|
// - fetch: network callback to actually send a particular download request to a physical remote peer
|
|
// - cancel: task callback to abort an in-flight download request and allow rescheduling it (in case of lost peer)
|
|
// - capacity: network callback to retrieve the estimated type-specific bandwidth capacity of a peer (traffic shaping)
|
|
// - idle: network callback to retrieve the currently (type specific) idle peers that can be assigned tasks
|
|
// - setIdle: network callback to set a peer back to idle and update its estimated capacity (traffic shaping)
|
|
// - kind: textual label of the type being downloaded to display in log messages
|
|
func (d *Downloader) fetchParts(deliveryCh chan dataPack, deliver func(dataPack) (int, error), wakeCh chan bool,
|
|
expire func() map[string]int, pending func() int, inFlight func() bool, throttle func() bool, reserve func(*peerConnection, int) (*fetchRequest, bool, error),
|
|
fetchHook func([]*types.Header), fetch func(*peerConnection, *fetchRequest) error, cancel func(*fetchRequest), capacity func(*peerConnection) int,
|
|
idle func() ([]*peerConnection, int), setIdle func(*peerConnection, int), kind string) error {
|
|
|
|
// Create a ticker to detect expired retrieval tasks
|
|
ticker := time.NewTicker(100 * time.Millisecond)
|
|
defer ticker.Stop()
|
|
|
|
update := make(chan struct{}, 1)
|
|
|
|
// Prepare the queue and fetch block parts until the block header fetcher's done
|
|
finished := false
|
|
for {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
|
|
case packet := <-deliveryCh:
|
|
// If the peer was previously banned and failed to deliver its pack
|
|
// in a reasonable time frame, ignore its message.
|
|
if peer := d.peers.Peer(packet.PeerId()); peer != nil {
|
|
// Deliver the received chunk of data and check chain validity
|
|
accepted, err := deliver(packet)
|
|
if errors.Is(err, errInvalidChain) {
|
|
return err
|
|
}
|
|
// Unless a peer delivered something completely else than requested (usually
|
|
// caused by a timed out request which came through in the end), set it to
|
|
// idle. If the delivery's stale, the peer should have already been idled.
|
|
if !errors.Is(err, errStaleDelivery) {
|
|
setIdle(peer, accepted)
|
|
}
|
|
// Issue a log to the user to see what's going on
|
|
switch {
|
|
case err == nil && packet.Items() == 0:
|
|
peer.log.Trace("Requested data not delivered", "type", kind)
|
|
case err == nil:
|
|
peer.log.Trace("Delivered new batch of data", "type", kind, "count", packet.Stats())
|
|
default:
|
|
peer.log.Trace("Failed to deliver retrieved data", "type", kind, "err", err)
|
|
}
|
|
}
|
|
// Blocks assembled, try to update the progress
|
|
select {
|
|
case update <- struct{}{}:
|
|
default:
|
|
}
|
|
|
|
case cont := <-wakeCh:
|
|
// The header fetcher sent a continuation flag, check if it's done
|
|
if !cont {
|
|
finished = true
|
|
}
|
|
// Headers arrive, try to update the progress
|
|
select {
|
|
case update <- struct{}{}:
|
|
default:
|
|
}
|
|
|
|
case <-ticker.C:
|
|
// Sanity check update the progress
|
|
select {
|
|
case update <- struct{}{}:
|
|
default:
|
|
}
|
|
|
|
case <-update:
|
|
// Short circuit if we lost all our peers
|
|
if d.peers.Len() == 0 {
|
|
return errNoPeers
|
|
}
|
|
// Check for fetch request timeouts and demote the responsible peers
|
|
for pid, fails := range expire() {
|
|
if peer := d.peers.Peer(pid); peer != nil {
|
|
// If a lot of retrieval elements expired, we might have overestimated the remote peer or perhaps
|
|
// ourselves. Only reset to minimal throughput but don't drop just yet. If even the minimal times
|
|
// out that sync wise we need to get rid of the peer.
|
|
//
|
|
// The reason the minimum threshold is 2 is because the downloader tries to estimate the bandwidth
|
|
// and latency of a peer separately, which requires pushing the measures capacity a bit and seeing
|
|
// how response times reacts, to it always requests one more than the minimum (i.e. min 2).
|
|
if fails > 2 {
|
|
peer.log.Trace("Data delivery timed out", "type", kind)
|
|
setIdle(peer, 0)
|
|
} else {
|
|
peer.log.Debug("Stalling delivery, dropping", "type", kind)
|
|
|
|
if d.dropPeer == nil {
|
|
// The dropPeer method is nil when `--copydb` is used for a local copy.
|
|
// Timeouts can occur if e.g. compaction hits at the wrong time, and can be ignored
|
|
peer.log.Warn("Downloader wants to drop peer, but peerdrop-function is not set", "peer", pid)
|
|
} else {
|
|
d.dropPeer(pid)
|
|
|
|
// If this peer was the master peer, abort sync immediately
|
|
d.cancelLock.RLock()
|
|
master := pid == d.cancelPeer
|
|
d.cancelLock.RUnlock()
|
|
|
|
if master {
|
|
d.cancel()
|
|
return errTimeout
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// If there's nothing more to fetch, wait or terminate
|
|
if pending() == 0 {
|
|
if !inFlight() && finished {
|
|
log.Debug("Data fetching completed", "type", kind)
|
|
return nil
|
|
}
|
|
break
|
|
}
|
|
// Send a download request to all idle peers, until throttled
|
|
progressed, throttled, running := false, false, inFlight()
|
|
idles, total := idle()
|
|
|
|
for _, peer := range idles {
|
|
// Short circuit if throttling activated
|
|
if throttle() {
|
|
throttled = true
|
|
break
|
|
}
|
|
// Short circuit if there is no more available task.
|
|
if pending() == 0 {
|
|
break
|
|
}
|
|
// Reserve a chunk of fetches for a peer. A nil can mean either that
|
|
// no more headers are available, or that the peer is known not to
|
|
// have them.
|
|
request, progress, err := reserve(peer, capacity(peer))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if progress {
|
|
progressed = true
|
|
}
|
|
if request == nil {
|
|
continue
|
|
}
|
|
if request.From > 0 {
|
|
peer.log.Trace("Requesting new batch of data", "type", kind, "from", request.From)
|
|
} else {
|
|
peer.log.Trace("Requesting new batch of data", "type", kind, "count", len(request.Headers), "from", request.Headers[0].Number)
|
|
}
|
|
// Fetch the chunk and make sure any errors return the hashes to the queue
|
|
if fetchHook != nil {
|
|
fetchHook(request.Headers)
|
|
}
|
|
if err := fetch(peer, request); err != nil {
|
|
// Although we could try and make an attempt to fix this, this error really
|
|
// means that we've double allocated a fetch task to a peer. If that is the
|
|
// case, the internal state of the downloader and the queue is very wrong so
|
|
// better hard crash and note the error instead of silently accumulating into
|
|
// a much bigger issue.
|
|
panic(fmt.Sprintf("%v: %s fetch assignment failed", peer, kind))
|
|
}
|
|
running = true
|
|
}
|
|
// Make sure that we have peers available for fetching. If all peers have been tried
|
|
// and all failed throw an error
|
|
if !progressed && !throttled && !running && len(idles) == total && pending() > 0 {
|
|
return errPeersUnavailable
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// processHeaders takes batches of retrieved headers from an input channel and
|
|
// keeps processing and scheduling them into the header chain and downloader's
|
|
// queue until the stream ends or a failure occurs.
|
|
func (d *Downloader) processHeaders(origin uint64, pivot uint64, td *big.Int) error {
|
|
// Keep a count of uncertain headers to roll back
|
|
var rollback []*types.Header
|
|
mode := d.getMode()
|
|
defer func() {
|
|
if len(rollback) > 0 {
|
|
// Flatten the headers and roll them back
|
|
hashes := make([]common.Hash, len(rollback))
|
|
for i, header := range rollback {
|
|
hashes[i] = header.Hash()
|
|
}
|
|
lastHeader, lastFastBlock, lastBlock := d.lightchain.CurrentHeader().Number, common.Big0, common.Big0
|
|
if mode != LightSync {
|
|
lastFastBlock = d.blockchain.CurrentFastBlock().Number()
|
|
lastBlock = d.blockchain.CurrentBlock().Number()
|
|
}
|
|
d.lightchain.Rollback(hashes)
|
|
curFastBlock, curBlock := common.Big0, common.Big0
|
|
if mode != LightSync {
|
|
curFastBlock = d.blockchain.CurrentFastBlock().Number()
|
|
curBlock = d.blockchain.CurrentBlock().Number()
|
|
}
|
|
log.Warn("Rolled back headers", "count", len(hashes),
|
|
"header", fmt.Sprintf("%d->%d", lastHeader, d.lightchain.CurrentHeader().Number),
|
|
"fast", fmt.Sprintf("%d->%d", lastFastBlock, curFastBlock),
|
|
"block", fmt.Sprintf("%d->%d", lastBlock, curBlock))
|
|
}
|
|
}()
|
|
|
|
// Wait for batches of headers to process
|
|
gotHeaders := false
|
|
|
|
for {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
|
|
case headers := <-d.headerProcCh:
|
|
// Terminate header processing if we synced up
|
|
if len(headers) == 0 {
|
|
// Notify everyone that headers are fully processed
|
|
for _, ch := range []chan bool{d.bodyWakeCh, d.receiptWakeCh} {
|
|
select {
|
|
case ch <- false:
|
|
case <-d.cancelCh:
|
|
}
|
|
}
|
|
// If no headers were retrieved at all, the peer violated its TD promise that it had a
|
|
// better chain compared to ours. The only exception is if its promised blocks were
|
|
// already imported by other means (e.g. fetcher):
|
|
//
|
|
// R <remote peer>, L <local node>: Both at block 10
|
|
// R: Mine block 11, and propagate it to L
|
|
// L: Queue block 11 for import
|
|
// L: Notice that R's head and TD increased compared to ours, start sync
|
|
// L: Import of block 11 finishes
|
|
// L: Sync begins, and finds common ancestor at 11
|
|
// L: Request new headers up from 11 (R's TD was higher, it must have something)
|
|
// R: Nothing to give
|
|
if mode != LightSync {
|
|
head := d.blockchain.CurrentBlock()
|
|
if !gotHeaders && td.Cmp(d.blockchain.GetTd(head.Hash(), head.NumberU64())) > 0 {
|
|
return errStallingPeer
|
|
}
|
|
}
|
|
// If fast or light syncing, ensure promised headers are indeed delivered. This is
|
|
// needed to detect scenarios where an attacker feeds a bad pivot and then bails out
|
|
// of delivering the post-pivot blocks that would flag the invalid content.
|
|
//
|
|
// This check cannot be executed "as is" for full imports, since blocks may still be
|
|
// queued for processing when the header download completes. However, as long as the
|
|
// peer gave us something useful, we're already happy/progressed (above check).
|
|
if mode == FastSync || mode == LightSync {
|
|
head := d.lightchain.CurrentHeader()
|
|
if td.Cmp(d.lightchain.GetTd(head.Hash(), head.Number.Uint64())) > 0 {
|
|
return errStallingPeer
|
|
}
|
|
}
|
|
// Disable any rollback and return
|
|
rollback = nil
|
|
return nil
|
|
}
|
|
// Otherwise split the chunk of headers into batches and process them
|
|
gotHeaders = true
|
|
for len(headers) > 0 {
|
|
// Terminate if something failed in between processing chunks
|
|
select {
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
default:
|
|
}
|
|
// Select the next chunk of headers to import
|
|
limit := maxHeadersProcess
|
|
if limit > len(headers) {
|
|
limit = len(headers)
|
|
}
|
|
chunk := headers[:limit]
|
|
// In case of header only syncing, validate the chunk immediately
|
|
if mode == FastSync || mode == LightSync {
|
|
// Collect the yet unknown headers to mark them as uncertain
|
|
unknown := make([]*types.Header, 0, len(chunk))
|
|
for _, header := range chunk {
|
|
if !d.lightchain.HasHeader(header.Hash(), header.Number.Uint64()) {
|
|
unknown = append(unknown, header)
|
|
}
|
|
}
|
|
// If we're importing pure headers, verify based on their recentness
|
|
frequency := fsHeaderCheckFrequency
|
|
if chunk[len(chunk)-1].Number.Uint64()+uint64(fsHeaderForceVerify) > pivot {
|
|
frequency = 1
|
|
}
|
|
if n, err := d.lightchain.InsertHeaderChain(chunk, frequency); err != nil {
|
|
// If some headers were inserted, add them too to the rollback list
|
|
if n > 0 {
|
|
rollback = append(rollback, chunk[:n]...)
|
|
}
|
|
log.Debug("Invalid header encountered", "number", chunk[n].Number, "hash", chunk[n].Hash(), "err", err)
|
|
return fmt.Errorf("%w: %v", errInvalidChain, err)
|
|
}
|
|
// All verifications passed, store newly found uncertain headers
|
|
rollback = append(rollback, unknown...)
|
|
if len(rollback) > fsHeaderSafetyNet {
|
|
rollback = append(rollback[:0], rollback[len(rollback)-fsHeaderSafetyNet:]...)
|
|
}
|
|
}
|
|
// Unless we're doing light chains, schedule the headers for associated content retrieval
|
|
if mode == FullSync || mode == FastSync {
|
|
// If we've reached the allowed number of pending headers, stall a bit
|
|
for d.queue.PendingBlocks() >= maxQueuedHeaders || d.queue.PendingReceipts() >= maxQueuedHeaders {
|
|
select {
|
|
case <-d.cancelCh:
|
|
return errCanceled
|
|
case <-time.After(time.Second):
|
|
}
|
|
}
|
|
// Otherwise insert the headers for content retrieval
|
|
inserts := d.queue.Schedule(chunk, origin)
|
|
if len(inserts) != len(chunk) {
|
|
log.Debug("Stale headers")
|
|
return fmt.Errorf("%w: stale headers", errBadPeer)
|
|
}
|
|
}
|
|
headers = headers[limit:]
|
|
origin += uint64(limit)
|
|
}
|
|
// Update the highest block number we know if a higher one is found.
|
|
d.syncStatsLock.Lock()
|
|
if d.syncStatsChainHeight < origin {
|
|
d.syncStatsChainHeight = origin - 1
|
|
}
|
|
d.syncStatsLock.Unlock()
|
|
|
|
// Signal the content downloaders of the availablility of new tasks
|
|
for _, ch := range []chan bool{d.bodyWakeCh, d.receiptWakeCh} {
|
|
select {
|
|
case ch <- true:
|
|
default:
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// processFullSyncContent takes fetch results from the queue and imports them into the chain.
|
|
func (d *Downloader) processFullSyncContent() error {
|
|
for {
|
|
results := d.queue.Results(true)
|
|
if len(results) == 0 {
|
|
return nil
|
|
}
|
|
if d.chainInsertHook != nil {
|
|
d.chainInsertHook(results)
|
|
}
|
|
if err := d.importBlockResults(results); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
func (d *Downloader) importBlockResults(results []*fetchResult) error {
|
|
// Check for any early termination requests
|
|
if len(results) == 0 {
|
|
return nil
|
|
}
|
|
select {
|
|
case <-d.quitCh:
|
|
return errCancelContentProcessing
|
|
default:
|
|
}
|
|
// Retrieve the a batch of results to import
|
|
first, last := results[0].Header, results[len(results)-1].Header
|
|
log.Debug("Inserting downloaded chain", "items", len(results),
|
|
"firstnum", first.Number, "firsthash", first.Hash(),
|
|
"lastnum", last.Number, "lasthash", last.Hash(),
|
|
)
|
|
blocks := make([]*types.Block, len(results))
|
|
for i, result := range results {
|
|
blocks[i] = types.NewBlockWithHeader(result.Header).WithBody(result.Transactions, result.Uncles)
|
|
}
|
|
if index, err := d.blockchain.InsertChain(blocks); err != nil {
|
|
if index < len(results) {
|
|
log.Debug("Downloaded item processing failed", "number", results[index].Header.Number, "hash", results[index].Header.Hash(), "err", err)
|
|
} else {
|
|
// The InsertChain method in blockchain.go will sometimes return an out-of-bounds index,
|
|
// when it needs to preprocess blocks to import a sidechain.
|
|
// The importer will put together a new list of blocks to import, which is a superset
|
|
// of the blocks delivered from the downloader, and the indexing will be off.
|
|
log.Debug("Downloaded item processing failed on sidechain import", "index", index, "err", err)
|
|
}
|
|
return fmt.Errorf("%w: %v", errInvalidChain, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// processFastSyncContent takes fetch results from the queue and writes them to the
|
|
// database. It also controls the synchronisation of state nodes of the pivot block.
|
|
func (d *Downloader) processFastSyncContent(latest *types.Header) error {
|
|
// Start syncing state of the reported head block. This should get us most of
|
|
// the state of the pivot block.
|
|
sync := d.syncState(latest.Root)
|
|
defer sync.Cancel()
|
|
closeOnErr := func(s *stateSync) {
|
|
if err := s.Wait(); err != nil && err != errCancelStateFetch && err != errCanceled {
|
|
d.queue.Close() // wake up Results
|
|
}
|
|
}
|
|
go closeOnErr(sync)
|
|
// Figure out the ideal pivot block. Note, that this goalpost may move if the
|
|
// sync takes long enough for the chain head to move significantly.
|
|
pivot := uint64(0)
|
|
if height := latest.Number.Uint64(); height > uint64(fsMinFullBlocks) {
|
|
pivot = height - uint64(fsMinFullBlocks)
|
|
}
|
|
// To cater for moving pivot points, track the pivot block and subsequently
|
|
// accumulated download results separately.
|
|
var (
|
|
oldPivot *fetchResult // Locked in pivot block, might change eventually
|
|
oldTail []*fetchResult // Downloaded content after the pivot
|
|
)
|
|
for {
|
|
// Wait for the next batch of downloaded data to be available, and if the pivot
|
|
// block became stale, move the goalpost
|
|
results := d.queue.Results(oldPivot == nil) // Block if we're not monitoring pivot staleness
|
|
if len(results) == 0 {
|
|
// If pivot sync is done, stop
|
|
if oldPivot == nil {
|
|
return sync.Cancel()
|
|
}
|
|
// If sync failed, stop
|
|
select {
|
|
case <-d.cancelCh:
|
|
sync.Cancel()
|
|
return errCanceled
|
|
default:
|
|
}
|
|
}
|
|
if d.chainInsertHook != nil {
|
|
d.chainInsertHook(results)
|
|
}
|
|
if oldPivot != nil {
|
|
results = append(append([]*fetchResult{oldPivot}, oldTail...), results...)
|
|
}
|
|
// Split around the pivot block and process the two sides via fast/full sync
|
|
if atomic.LoadInt32(&d.committed) == 0 {
|
|
latest = results[len(results)-1].Header
|
|
if height := latest.Number.Uint64(); height > pivot+2*uint64(fsMinFullBlocks) {
|
|
log.Warn("Pivot became stale, moving", "old", pivot, "new", height-uint64(fsMinFullBlocks))
|
|
pivot = height - uint64(fsMinFullBlocks)
|
|
}
|
|
}
|
|
P, beforeP, afterP := splitAroundPivot(pivot, results)
|
|
if err := d.commitFastSyncData(beforeP, sync); err != nil {
|
|
return err
|
|
}
|
|
if P != nil {
|
|
// If new pivot block found, cancel old state retrieval and restart
|
|
if oldPivot != P {
|
|
sync.Cancel()
|
|
|
|
sync = d.syncState(P.Header.Root)
|
|
defer sync.Cancel()
|
|
go closeOnErr(sync)
|
|
oldPivot = P
|
|
}
|
|
// Wait for completion, occasionally checking for pivot staleness
|
|
select {
|
|
case <-sync.done:
|
|
if sync.err != nil {
|
|
return sync.err
|
|
}
|
|
if err := d.commitPivotBlock(P); err != nil {
|
|
return err
|
|
}
|
|
oldPivot = nil
|
|
|
|
case <-time.After(time.Second):
|
|
oldTail = afterP
|
|
continue
|
|
}
|
|
}
|
|
// Fast sync done, pivot commit done, full import
|
|
if err := d.importBlockResults(afterP); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
func splitAroundPivot(pivot uint64, results []*fetchResult) (p *fetchResult, before, after []*fetchResult) {
|
|
for _, result := range results {
|
|
num := result.Header.Number.Uint64()
|
|
switch {
|
|
case num < pivot:
|
|
before = append(before, result)
|
|
case num == pivot:
|
|
p = result
|
|
default:
|
|
after = append(after, result)
|
|
}
|
|
}
|
|
return p, before, after
|
|
}
|
|
|
|
func (d *Downloader) commitFastSyncData(results []*fetchResult, stateSync *stateSync) error {
|
|
// Check for any early termination requests
|
|
if len(results) == 0 {
|
|
return nil
|
|
}
|
|
select {
|
|
case <-d.quitCh:
|
|
return errCancelContentProcessing
|
|
case <-stateSync.done:
|
|
if err := stateSync.Wait(); err != nil {
|
|
return err
|
|
}
|
|
default:
|
|
}
|
|
// Retrieve the a batch of results to import
|
|
first, last := results[0].Header, results[len(results)-1].Header
|
|
log.Debug("Inserting fast-sync blocks", "items", len(results),
|
|
"firstnum", first.Number, "firsthash", first.Hash(),
|
|
"lastnumn", last.Number, "lasthash", last.Hash(),
|
|
)
|
|
blocks := make([]*types.Block, len(results))
|
|
receipts := make([]types.Receipts, len(results))
|
|
for i, result := range results {
|
|
blocks[i] = types.NewBlockWithHeader(result.Header).WithBody(result.Transactions, result.Uncles)
|
|
receipts[i] = result.Receipts
|
|
}
|
|
if index, err := d.blockchain.InsertReceiptChain(blocks, receipts, d.ancientLimit); err != nil {
|
|
log.Debug("Downloaded item processing failed", "number", results[index].Header.Number, "hash", results[index].Header.Hash(), "err", err)
|
|
return fmt.Errorf("%w: %v", errInvalidChain, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (d *Downloader) commitPivotBlock(result *fetchResult) error {
|
|
block := types.NewBlockWithHeader(result.Header).WithBody(result.Transactions, result.Uncles)
|
|
log.Debug("Committing fast sync pivot as new head", "number", block.Number(), "hash", block.Hash())
|
|
|
|
// Commit the pivot block as the new head, will require full sync from here on
|
|
if _, err := d.blockchain.InsertReceiptChain([]*types.Block{block}, []types.Receipts{result.Receipts}, d.ancientLimit); err != nil {
|
|
return err
|
|
}
|
|
if err := d.blockchain.FastSyncCommitHead(block.Hash()); err != nil {
|
|
return err
|
|
}
|
|
atomic.StoreInt32(&d.committed, 1)
|
|
|
|
// If we had a bloom filter for the state sync, deallocate it now. Note, we only
|
|
// deallocate internally, but keep the empty wrapper. This ensures that if we do
|
|
// a rollback after committing the pivot and restarting fast sync, we don't end
|
|
// up using a nil bloom. Empty bloom is fine, it just returns that it does not
|
|
// have the info we need, so reach down to the database instead.
|
|
if d.stateBloom != nil {
|
|
d.stateBloom.Close()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeliverHeaders injects a new batch of block headers received from a remote
|
|
// node into the download schedule.
|
|
func (d *Downloader) DeliverHeaders(id string, headers []*types.Header) (err error) {
|
|
return d.deliver(id, d.headerCh, &headerPack{id, headers}, headerInMeter, headerDropMeter)
|
|
}
|
|
|
|
// DeliverBodies injects a new batch of block bodies received from a remote node.
|
|
func (d *Downloader) DeliverBodies(id string, transactions [][]*types.Transaction, uncles [][]*types.Header) (err error) {
|
|
return d.deliver(id, d.bodyCh, &bodyPack{id, transactions, uncles}, bodyInMeter, bodyDropMeter)
|
|
}
|
|
|
|
// DeliverReceipts injects a new batch of receipts received from a remote node.
|
|
func (d *Downloader) DeliverReceipts(id string, receipts [][]*types.Receipt) (err error) {
|
|
return d.deliver(id, d.receiptCh, &receiptPack{id, receipts}, receiptInMeter, receiptDropMeter)
|
|
}
|
|
|
|
// DeliverNodeData injects a new batch of node state data received from a remote node.
|
|
func (d *Downloader) DeliverNodeData(id string, data [][]byte) (err error) {
|
|
return d.deliver(id, d.stateCh, &statePack{id, data}, stateInMeter, stateDropMeter)
|
|
}
|
|
|
|
// deliver injects a new batch of data received from a remote node.
|
|
func (d *Downloader) deliver(id string, destCh chan dataPack, packet dataPack, inMeter, dropMeter metrics.Meter) (err error) {
|
|
// Update the delivery metrics for both good and failed deliveries
|
|
inMeter.Mark(int64(packet.Items()))
|
|
defer func() {
|
|
if err != nil {
|
|
dropMeter.Mark(int64(packet.Items()))
|
|
}
|
|
}()
|
|
// Deliver or abort if the sync is canceled while queuing
|
|
d.cancelLock.RLock()
|
|
cancel := d.cancelCh
|
|
d.cancelLock.RUnlock()
|
|
if cancel == nil {
|
|
return errNoSyncActive
|
|
}
|
|
select {
|
|
case destCh <- packet:
|
|
return nil
|
|
case <-cancel:
|
|
return errNoSyncActive
|
|
}
|
|
}
|
|
|
|
// qosTuner is the quality of service tuning loop that occasionally gathers the
|
|
// peer latency statistics and updates the estimated request round trip time.
|
|
func (d *Downloader) qosTuner() {
|
|
for {
|
|
// Retrieve the current median RTT and integrate into the previoust target RTT
|
|
rtt := time.Duration((1-qosTuningImpact)*float64(atomic.LoadUint64(&d.rttEstimate)) + qosTuningImpact*float64(d.peers.medianRTT()))
|
|
atomic.StoreUint64(&d.rttEstimate, uint64(rtt))
|
|
|
|
// A new RTT cycle passed, increase our confidence in the estimated RTT
|
|
conf := atomic.LoadUint64(&d.rttConfidence)
|
|
conf = conf + (1000000-conf)/2
|
|
atomic.StoreUint64(&d.rttConfidence, conf)
|
|
|
|
// Log the new QoS values and sleep until the next RTT
|
|
log.Debug("Recalculated downloader QoS values", "rtt", rtt, "confidence", float64(conf)/1000000.0, "ttl", d.requestTTL())
|
|
select {
|
|
case <-d.quitCh:
|
|
return
|
|
case <-time.After(rtt):
|
|
}
|
|
}
|
|
}
|
|
|
|
// qosReduceConfidence is meant to be called when a new peer joins the downloader's
|
|
// peer set, needing to reduce the confidence we have in out QoS estimates.
|
|
func (d *Downloader) qosReduceConfidence() {
|
|
// If we have a single peer, confidence is always 1
|
|
peers := uint64(d.peers.Len())
|
|
if peers == 0 {
|
|
// Ensure peer connectivity races don't catch us off guard
|
|
return
|
|
}
|
|
if peers == 1 {
|
|
atomic.StoreUint64(&d.rttConfidence, 1000000)
|
|
return
|
|
}
|
|
// If we have a ton of peers, don't drop confidence)
|
|
if peers >= uint64(qosConfidenceCap) {
|
|
return
|
|
}
|
|
// Otherwise drop the confidence factor
|
|
conf := atomic.LoadUint64(&d.rttConfidence) * (peers - 1) / peers
|
|
if float64(conf)/1000000 < rttMinConfidence {
|
|
conf = uint64(rttMinConfidence * 1000000)
|
|
}
|
|
atomic.StoreUint64(&d.rttConfidence, conf)
|
|
|
|
rtt := time.Duration(atomic.LoadUint64(&d.rttEstimate))
|
|
log.Debug("Relaxed downloader QoS values", "rtt", rtt, "confidence", float64(conf)/1000000.0, "ttl", d.requestTTL())
|
|
}
|
|
|
|
// requestRTT returns the current target round trip time for a download request
|
|
// to complete in.
|
|
//
|
|
// Note, the returned RTT is .9 of the actually estimated RTT. The reason is that
|
|
// the downloader tries to adapt queries to the RTT, so multiple RTT values can
|
|
// be adapted to, but smaller ones are preferred (stabler download stream).
|
|
func (d *Downloader) requestRTT() time.Duration {
|
|
return time.Duration(atomic.LoadUint64(&d.rttEstimate)) * 9 / 10
|
|
}
|
|
|
|
// requestTTL returns the current timeout allowance for a single download request
|
|
// to finish under.
|
|
func (d *Downloader) requestTTL() time.Duration {
|
|
var (
|
|
rtt = time.Duration(atomic.LoadUint64(&d.rttEstimate))
|
|
conf = float64(atomic.LoadUint64(&d.rttConfidence)) / 1000000.0
|
|
)
|
|
ttl := time.Duration(ttlScaling) * time.Duration(float64(rtt)/conf)
|
|
if ttl > ttlLimit {
|
|
ttl = ttlLimit
|
|
}
|
|
return ttl
|
|
}
|