mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-03 10:33:45 +00:00
* Added checks to RPC requests and introduced new flags to customise the parameters (#657) * added a check to reject rpc requests with batch size > the one set using a newly added flag (rpcbatchlimit) * added a check to reject rpc requests whose result size > the one set using a newly added flag (rpcreturndatalimit) * updated the config files and docs * chg : trieTimeout from 60 to 10 mins (#692) * chg : trieTimeout from 60 to 10 mins * chg : cache.timout to 10m from 1h in configs * internal/cli/server : fix : added triesInMemory in config (#691) * changed version from 0.3.0 to 0.3.4-beta (#693) * fix nil state-sync issue, increase grpc limit (#695) * Increase grpc message size limit in pprof * consensus/bor/bor.go : stateSyncs init fixed [Fix #686] * eth/filters: handle nil state-sync before notify * eth/filters: update check Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> * core, tests/bor: add more tests for state-sync validation (#710) * core: add get state sync function for tests * tests/bor: add validation for state sync events post consensus * Arpit/temp bor sync (#701) * Increase grpc message size limit in pprof * ReadBorReceipts improvements * use internal function * fix tests * fetch geth upstread for ReadBorReceiptRLP * Only query bor receipt when the query index is equal to # tx in block body This change reduces the frequency of calling ReadBorReceipt and ReadBorTransaction, which are CPU and db intensive. * Revert "fetch geth upstread for ReadBorReceiptRLP" This reverts commit 2e838a6b1313d26674f3a8df4b044e35dcbf35a0. * Restore ReadBorReceiptRLP * fix bor receipts * remove unused * fix lints --------- Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Revert "chg : trieTimeout from 60 to 10 mins (#692)" (#720) This reverts commit241843c7e7. * Arpit/add execution pool 2 (#719) * initial * linters * linters * remove timeout * update pool * change pool size function * check nil * check nil * fix tests * Use execution pool from server in all handlers * simplify things * test fix * add support for cli, config * add to cli and config * merge base branch * debug statements * fix bug * atomic pointer timeout * add apis * update workerpool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * fix tests * mutex * refactor flag and value names * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * debug statements * fix bug * update workerpool * atomic pointer timeout * add apis * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * merge base branch * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * mutex * fix tests * Merge branch 'arpit/add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * Change default size of execution pool to 40 * refactor flag and value names * fix merge conflicts * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * fix linters * fix go.mod * change sec to ms * change default value for ep timeout * fix node api calls * comment setter for ep timeout --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * version change (#721) * Event based pprof (#732) * feature * Save pprof to /tmp --------- Co-authored-by: Jerry <jerrycgh@gmail.com> * Cherry-pick changes from develop (#738) * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) --------- Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * add max code init size check in txpool (#739) * Revert "Event based pprof" and update version (#742) * Revert "Event based pprof (#732)" This reverts commit22fa4033e8. * params: update version to 0.3.4-beta3 * packaging/templates: update bor version * internal/ethapi :: Fix : newRPCTransactionFromBlockIndex * Merge master to qa (#813) * Merge qa to master (#750) * Added checks to RPC requests and introduced new flags to customise the parameters (#657) * added a check to reject rpc requests with batch size > the one set using a newly added flag (rpcbatchlimit) * added a check to reject rpc requests whose result size > the one set using a newly added flag (rpcreturndatalimit) * updated the config files and docs * chg : trieTimeout from 60 to 10 mins (#692) * chg : trieTimeout from 60 to 10 mins * chg : cache.timout to 10m from 1h in configs * internal/cli/server : fix : added triesInMemory in config (#691) * changed version from 0.3.0 to 0.3.4-beta (#693) * fix nil state-sync issue, increase grpc limit (#695) * Increase grpc message size limit in pprof * consensus/bor/bor.go : stateSyncs init fixed [Fix #686] * eth/filters: handle nil state-sync before notify * eth/filters: update check Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> * core, tests/bor: add more tests for state-sync validation (#710) * core: add get state sync function for tests * tests/bor: add validation for state sync events post consensus * Arpit/temp bor sync (#701) * Increase grpc message size limit in pprof * ReadBorReceipts improvements * use internal function * fix tests * fetch geth upstread for ReadBorReceiptRLP * Only query bor receipt when the query index is equal to # tx in block body This change reduces the frequency of calling ReadBorReceipt and ReadBorTransaction, which are CPU and db intensive. * Revert "fetch geth upstread for ReadBorReceiptRLP" This reverts commit 2e838a6b1313d26674f3a8df4b044e35dcbf35a0. * Restore ReadBorReceiptRLP * fix bor receipts * remove unused * fix lints --------- Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Revert "chg : trieTimeout from 60 to 10 mins (#692)" (#720) This reverts commit241843c7e7. * Arpit/add execution pool 2 (#719) * initial * linters * linters * remove timeout * update pool * change pool size function * check nil * check nil * fix tests * Use execution pool from server in all handlers * simplify things * test fix * add support for cli, config * add to cli and config * merge base branch * debug statements * fix bug * atomic pointer timeout * add apis * update workerpool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * fix tests * mutex * refactor flag and value names * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * debug statements * fix bug * update workerpool * atomic pointer timeout * add apis * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * merge base branch * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * mutex * fix tests * Merge branch 'arpit/add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * Change default size of execution pool to 40 * refactor flag and value names * fix merge conflicts * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * fix linters * fix go.mod * change sec to ms * change default value for ep timeout * fix node api calls * comment setter for ep timeout --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * version change (#721) * Event based pprof (#732) * feature * Save pprof to /tmp --------- Co-authored-by: Jerry <jerrycgh@gmail.com> * Cherry-pick changes from develop (#738) * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) --------- Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * add max code init size check in txpool (#739) * Revert "Event based pprof" and update version (#742) * Revert "Event based pprof (#732)" This reverts commit22fa4033e8. * params: update version to 0.3.4-beta3 * packaging/templates: update bor version * params, packaging/templates: update bor version --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * core, miner: add sub-spans for tracing (#753) * core, miner: add sub-spans for tracing * fix linters * core: add logs for debugging * core: add more logs to print tdd while reorg * fix linters * core: minor fix * core: remove debug logs * core: use different span for write block and set head * core: use internal context for sending traces (#755) * core: add : impossible reorg block dump (#754) * add : impossible reorg block dump * chg : 3 seperate files for impossoble reorg dump * add : use exportBlocks method and RLP blocks before writing * chg : small changes * bump : go version from 1.19 to 1.20.1 (#761) * Revert "bump : go version from 1.19 to 1.20.1 (#761)" This reverts commit4561012af9. * core/vm: use optimized bigint (#26021) * Add holiman/big * Fix linter * Bump version to v0.3.5 * fix lints from develop (few lints decided to appear from code that was untouched, weird) * upgrade crypto lib version (#770) * bump dep : github.com/Masterminds/goutils to v1.1.1 (#769) * mardizzone/pos-1313: bump crypto dependency (#772) * dev: chg: bumd net dependency * dev: chg: bump crypto dependency * dev: chg: bump crypto dependency * bump dep : golang.org/x/net to v0.8.0 (#771) * Verify validator set against local contract on receiving an end-of-sprint block (#768) * Verify validator set against local contract on receiving an end-of-sprint block * Fix tests * Respect error returned by ParseValidators * Keep going back until a parent block presents * core/txpool: implement DoS defenses from geth (#778) * Hotfixes and deps bump (#776) * dev: chg: bump deps * internal/cli/server, rpc: lower down http readtimeout to 10s * dev: chg: get p2p adapter * dev: chg: lower down jsonrpc readtimeout to 10s * cherry-pick txpool optimisation changes * add check for empty lists in txpool (#704) * add check * linters * core, miner: add empty instrumentation name for tracing --------- Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Evgeny Danilenko <6655321@bk.ru> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * packaging,params: bump to v0.3.6 (#782) * v0.3.6 fix (#787) * Fix get validator set in header verifier * chg : commit tx logs from info to debug (#673) * chg : commit tx logs from info to debug * fix : minor changes * chg : miner : commitTransactions-stats moved from info to debug * lint : fix linters * refactor logging * miner : chg : UnauthorizedSignerError to debug * lint : fix lint * fix : log.Logger interface compatibility --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Remove unnecessary sorting of valset from header in verification * dev: chg: version bump --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> * core: improve locks in txpool (#807) * added a write lock to the txs.filter method and a read lock to the txs.reheap method - both of which are called by Filter during reorg adjustments to txpool * txpool reorg locks * more locks * locks * linters * params, packaging: update version for v0.3.8-beta release * core: add logs in reheap --------- Co-authored-by: Alex <dalexwatts@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Merge qa to master (#808) * Added checks to RPC requests and introduced new flags to customise the parameters (#657) * added a check to reject rpc requests with batch size > the one set using a newly added flag (rpcbatchlimit) * added a check to reject rpc requests whose result size > the one set using a newly added flag (rpcreturndatalimit) * updated the config files and docs * chg : trieTimeout from 60 to 10 mins (#692) * chg : trieTimeout from 60 to 10 mins * chg : cache.timout to 10m from 1h in configs * internal/cli/server : fix : added triesInMemory in config (#691) * changed version from 0.3.0 to 0.3.4-beta (#693) * fix nil state-sync issue, increase grpc limit (#695) * Increase grpc message size limit in pprof * consensus/bor/bor.go : stateSyncs init fixed [Fix #686] * eth/filters: handle nil state-sync before notify * eth/filters: update check Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> * core, tests/bor: add more tests for state-sync validation (#710) * core: add get state sync function for tests * tests/bor: add validation for state sync events post consensus * Arpit/temp bor sync (#701) * Increase grpc message size limit in pprof * ReadBorReceipts improvements * use internal function * fix tests * fetch geth upstread for ReadBorReceiptRLP * Only query bor receipt when the query index is equal to # tx in block body This change reduces the frequency of calling ReadBorReceipt and ReadBorTransaction, which are CPU and db intensive. * Revert "fetch geth upstread for ReadBorReceiptRLP" This reverts commit 2e838a6b1313d26674f3a8df4b044e35dcbf35a0. * Restore ReadBorReceiptRLP * fix bor receipts * remove unused * fix lints --------- Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Revert "chg : trieTimeout from 60 to 10 mins (#692)" (#720) This reverts commit241843c7e7. * Arpit/add execution pool 2 (#719) * initial * linters * linters * remove timeout * update pool * change pool size function * check nil * check nil * fix tests * Use execution pool from server in all handlers * simplify things * test fix * add support for cli, config * add to cli and config * merge base branch * debug statements * fix bug * atomic pointer timeout * add apis * update workerpool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * fix tests * mutex * refactor flag and value names * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * debug statements * fix bug * update workerpool * atomic pointer timeout * add apis * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * merge base branch * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * mutex * fix tests * Merge branch 'arpit/add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * Change default size of execution pool to 40 * refactor flag and value names * fix merge conflicts * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * fix linters * fix go.mod * change sec to ms * change default value for ep timeout * fix node api calls * comment setter for ep timeout --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * version change (#721) * Event based pprof (#732) * feature * Save pprof to /tmp --------- Co-authored-by: Jerry <jerrycgh@gmail.com> * Cherry-pick changes from develop (#738) * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) --------- Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * add max code init size check in txpool (#739) * Revert "Event based pprof" and update version (#742) * Revert "Event based pprof (#732)" This reverts commit22fa4033e8. * params: update version to 0.3.4-beta3 * packaging/templates: update bor version * internal/ethapi :: Fix : newRPCTransactionFromBlockIndex * fix: remove assignment for bor receipt --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * Setting up bor to use hosted 18.04 runner as ubuntu provided 18.04 runner is end of life --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Alex <dalexwatts@gmail.com> Co-authored-by: Daniel Jones <djones@polygon.technology> * merge v0.3.9-alpha to qa (#824) * commit logs * CI: test launch devnet without hardcoded sleep time (pos-534) * CI: try using checked out bor path * CI: fix missing ; * CI: fix assignment operator * CI: echo peers and block no. * CI: cleanup * minor chg: add new line * dev: add: pos-944: snyk and govuln integration (#578) * dev: add: pos-944 security ci and readme * dev: add: pos-944 remove linters as this is included already in build ci * dev: chg: pos-947 dependencies upgrade to solve snyk security issues * dev: chg: update security-ci * dev: chg: remove linter to allow replacements for security issues * dev: add: pos-944 verify path when updating metrics from config * dev: add: pos-944 fix linter * dev: add: pos-944 add .snyk policy file / fix snyk code vulnerabilities * dev: fix: pos-944 import common package / gitignore snyk dccache file * dev: fix: pos-944 verify canonical path for crashers * dev: fix: pos-944 linter * dev: add: pos-976 add govuln check * dev: add: pos-976 test upload with permissions * dev: add: pos-976 remove duplicated upload * dev: add: pos-976 report upload * dev: add: pos-976 remove upload * dev: fix: pos-944 fix govuln action * dev: fix: pos-944 move govulncheck to security-ci * dev: fix: pos-944 bump golvun action and golang versions * dev: fix: pos-944 remove persmissions and fix conflicts * dev: chg: restore err msg * dev: chg: remove duplicated function * dev: chg: sort import * dev: chg: fix linter * dev: add: use common VerifyCrasher function to avoid duplications / replace deprecated ioutils.ReadFile * dev: fix: typo * fix linters * upgrade grpc version * add ignore rule for net/http2 * Shivam/txpool tracing (#604) * lock, unlock to rlock, runlock * add : tracing Pending() and Locals() * Log time spent in committing a tx during mining * Remove data from logging * Move log into case where a tx completes without error * profile fillTransactions * fix conflict * bug fixes * add logs * txpool: add tracing in Pending() * rearrange tracing * add attributes * fix * fix * log error in profiling * update file mode and file path for profiling * full profiling * fix log * fix log * less wait * fix * fix * logs * worker: use block number for prof files * initial * txList add * fix gas calculation * fix * green tests * linters * prettify * allocate less * no locks between pending and reorg * no locks * no locks on locals * more tests * linters * less allocs * comment * optimize errors * linters * fix * fix * Linters * linters * linters * simplify errors * atomics for transactions * fix * optimize workers * fix copy * linters * txpool tracing * linters * fix tracing * duration in mcs * locks * metrics * fix * cache hit/miss * less locks on evict * remove once * remove once * switch off pprof * fix data race * fix data race * add : sealed total/empty blocks metric gauge * add : RPC debug_getTraceStack * fix : RPC debug_getTraceStack * fix : RPC debug_getTraceStack for all go-routines * linters * add data race test on txpool * fix concurrency * noleak * increase batch size * prettify * tests * baseFee mutex * panic fix * linters * fix gas fee data race * linters * more transactions * debug * debug * fix ticker * fix test * add cacheMu * more tests * fix test panic * linters * add statistics * add statistics * txitems data race * fix tx list Has * fix : lint Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Reduce txArriveTimeout to 100ms * init : remove exit on keystore err * add : multiple keystore tolerance * lint : fix linters * chg : use standard logging * chg : logging strings * Added flags to run heimdall as a child process (#597) * Added flags to run heimdall as a child process * Fix: Lint * Fix btcd package dependency for CI * Update btcd package version * Try removing ambigious importts * dev: fix: lint fix for parallel tests * remove delete for ambigious import * Remove unwanted space * go mod tidy * try replace * try replace * use vendor * rename vendor * tidy * vendor btcec * clean up * remove submodule * remove submodule * remove submodule * remove submodule * remove vendor & added replacer in test * go mod tidy * added replacer * Update replacer * Update replacer * Merge branch 'develop' into run-heimdall-flags * Skip TestGolangBindings * Typo fix * Remove unwanted changes Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * dev: chg: update PR template to include nodes audience check (#641) * dev: chg: update PR template to include nodes audience check * dev: chg: better description * dev: chg: add entry to changes too * sonarqube integration (#658) * dev: add: sonarqube integration into security-ci * dev: add: exclude java files from sonarqube analysis * Merge branch 'qa' and 'master' into develop (#663) * Adding in Mumbai/Mainnet precursor deb packaging for tests to use during upgrade(iterations to come) * Added changes per discussion in PR, more changes may be necessary * Adding prerelease true * Disabling goreleaser * Removing README swap file * change bor_dir and add bor user for v0.3.0 release * rollback bor user and use root * metrics: handle equal to separated config flag (#596) * metrics: handle based config path * internal/cli/server: add more context to logs * use space separated flag and value in bor.service * fixed static-nodes related buf (os independent) (#598) * fixed static-nodes related buf (os independent) * taking static-nodes as input if default not present * Update default flags (#600) * internal/cli/server: use geth's default for txpool.pricelimit and add comments * builder/files: update config.toml for mainnet * packaging/templates: update defaults for mainnet and mumbai * internal/cli/server: skip overriding cache * packaging/templates: update cache value for mainnet * packaging/templates: update gcmode for archive mumbai node * metrics: handle nil telemetry config (#601) * resolve merge conflicts * update go version in release.yml * update goversion in makefile * update Docker login for goreleaser-cross v1.19 * Cleanup for the packager to use git tag in the package profile naming. Added conditional check for directory structure, this is in prep for v0.3.1, as this will create a failure on upgrade path in package due to file exist * added a toml configuration file with comments describing each flag (#607) * added a toml configuration file with comments describing each flag * internal/cli/server: update flag description * docs/cli: update example config and description of flags * docs: update new-cli docs Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * Adding of 0.3.0 package changes, control file updates, postinst changes, and packager update * added ancient datadir flag and toml field, need to decide on default value and update the conversion script * updated toml files with ancient field * Add support for new flags in new config.toml, which were present in old config.toml (#612) * added HTTPTimeouts, and TrieTimeout flag in new tol, from old toml * added RAW fields for these time.Duration flags * updated the conversion script to support these extra 4 flags * removed hcl and json config tests as we are only supporting toml config files * updated toml files with cache.timeout field * updated toml files with jsonrpc.timeouts field * tests/bor: expect a call for latest checkpoint * tests/bor: expect a call for latest checkpoint * packaging/templates: update cache values for archive nodes Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * remove unwanted code * Fix docker publish authentication issue In gorelease-cross 1.19+, dockerhub authentication will require docker logion action followed by mounting docker config file. See https://github.com/goreleaser/goreleaser-cross#github-actions. * Revert "update Docker login for goreleaser-cross v1.19" This reverts commit4d19cf5342. * Bump version to stable * Revert "Merge pull request #435 from maticnetwork/POS-553" This reverts commit657d262def, reversing changes made to88dbfa1c13. * revert change for release for go1.19 * Add default values to CLI helper and docs This commit adds default values to CLI helper and docs. When the default value of a string flag, slice string flag, or map string flag is empty, its helper message won't show any default value. * Add a summary of new CLI in docs * Updating packager as binutils changed version so that apt-get installs current versions * Add state pruning to new CLI * Minor wording fix in prune state description * Bumping control file versions * Mainnet Delhi fork * Set version to stable * change delhi hardfork block number * handle future chain import and skip peer drop (#650) * handle future chain import and skip peer drop * add block import metric * params: bump version to v0.3.3-stable * Bump bor version in control files for v0.3.3 mainnet release Co-authored-by: Daniel Jones <djones@polygon.technology> Co-authored-by: Will Button <wbutton@polygon.technology> Co-authored-by: Will Button <will@willbutton.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Daniel Jones <105369507+djpolygon@users.noreply.github.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> * CI: use matic-cli master branch * trigger ci * internal/cli/server : fix : added triesInMemory in config (#677) * update requirements in README (#681) * consensus/bor : add : devFakeAuthor flag * core,eth,internal/cli,internal/ethapi: add --rpc.allow-unprotected-txs flag to allow txs to get replayed (for shadow node) * internal/cli: add `skiptrace` flag for profiling (#715) * internal/cli: add skiptrace flag * docs: update docs for skiptrace flag * Added flag in Status to wait for backend, and fixed panic issue. (#708) * checking if backend is available during status call, and added a flag to wait if backend is not available * added test for status command (does not cover the whole code) * Revert "Reduce txArriveTimeout to 100ms" (#707) This reverts commit243d231fe4. * consensus/bor : add : devFakeAuthor flag (#697) * add check for empty lists in txpool (#704) * add check * linters * dev: chg: POS-215 move sonarqube to own ci (#733) * Added verbosity flag, supports log-level as well, but will remove that in future. (#722) * changed log-level flag back to verbosity, and updated the conversion script * supporting both verbosity and log-level, with a message to deprecat log-level * converted verbosity to a int value * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) * Add : mutex pprof profile (#731) * add : mutex pprof profile * rm : remove trace from default pprof profiles * chg : commit tx logs from info to debug (#673) * chg : commit tx logs from info to debug * fix : minor changes * chg : miner : commitTransactions-stats moved from info to debug * lint : fix linters * refactor logging * miner : chg : UnauthorizedSignerError to debug * lint : fix lint * fix : log.Logger interface compatibility --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Add : commit details to bor version (#730) * add : commit details to bor version * fix : MAKEFILE * undo : rm test-txpool-race * rm : params/build_date * rm : params/gitbranch and params/gitdate * core,docs/cli,internal/cli/server: make docs * builder,docs/cli,packaging: update toml files * mardizzone/hotfix-snyk: remove vcs build when running snyk (#745) * Feat : SetMaxPeers (#726) * init : add admin.setMaxPeers and getMaxPeers * lint : fix lint * add : some comments * Update wiki link (#762) * Heimdall App implementation (#646) * added support for miner.recommit flag (#743) * interrupting commit experiment (#556) * initial * delete * linters * big benchmark * benchmark big ints * delay * fix generate * remove debug * miner : chg : remove noempty check * fix lints * consensus/bor: handle unauthorized signer in consensus.Prepare (#651) * fix : break loop fix * lint : fix * lint : more lint fix * fix : skip TestEmptyWorkEthash and TestEmptyWorkClique * add : metrics commitInterruptCounter --------- Co-authored-by: Shivam Sharma <shivam691999@gmail.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * internal/cli: added missing flags (#744) * minor comment update * added support for rpc.evmtimeout flag * added support for vmdebug (EnablePreimageRecording) flag * added support for jsonrpc.auth.(jwtsecret, addr, port, vhosts) flags * added support for miner.recommit flag * added support for gpo.maxheaderhistory and gpo.maxblockhistory flag * Revert "added support for miner.recommit flag" This reverts commit fcb722e4bf5bdda23d4c91da40ab95c9023a80c3. * added pprof related flags (expect --pprof.cpuprofile - Write CPU profile to the given file) * added support for --dev.gaslimit flag * added support for --fdlimit flag * added support for --netrestrict flag * added support for --nodekey and --nodekeyhex flag * added support for --vmodule, --log.json, --log.backtrace, and --log.debug flags * fixed related lint errors * fix lints from develop (few lints decided to appear from code that was untouched, weird) * more weird lints from develop * small precautionary fix * small bug ;) fix in NetRestrict * weird lints * change vmdebug = true to vmdebug = false * internal/ethapi: set rpc gas cap as default gas limit when creating access list * add : testcase for CommitInterruptExperiment (#792) * add : TestCommitInterruptExperimentBor * lint : fix lint * chg : add waitgroup * dev: chg: continue on error when uploading snyk results to GH (#795) * consensus/bor: revert handle unauthorized signer in consensus.Prepare * Revert "consensus/bor: handle unauthorized signer in consensus.Prepare (#651)" This reverts commit 9ce8c7de75a1b5021bb6f2b8086e813c8244b22c. * eth/downloader/whitelist: skip future chain validation (#796) * eth/downloader/whitelist: skip future chain validation * eth/downloader/whitelist: fix tests for future chain import * Setting up bor to use hosted 18.04 runner as ubuntu provided 18.04 runner is end of life * Merge qa to develop (#814) * Adding in Mumbai/Mainnet precursor deb packaging for tests to use during upgrade(iterations to come) * Added changes per discussion in PR, more changes may be necessary * Adding prerelease true * Disabling goreleaser * Removing README swap file * change bor_dir and add bor user for v0.3.0 release * rollback bor user and use root * metrics: handle equal to separated config flag (#596) * metrics: handle based config path * internal/cli/server: add more context to logs * use space separated flag and value in bor.service * fixed static-nodes related buf (os independent) (#598) * fixed static-nodes related buf (os independent) * taking static-nodes as input if default not present * Update default flags (#600) * internal/cli/server: use geth's default for txpool.pricelimit and add comments * builder/files: update config.toml for mainnet * packaging/templates: update defaults for mainnet and mumbai * internal/cli/server: skip overriding cache * packaging/templates: update cache value for mainnet * packaging/templates: update gcmode for archive mumbai node * metrics: handle nil telemetry config (#601) * resolve merge conflicts * update go version in release.yml * update goversion in makefile * update Docker login for goreleaser-cross v1.19 * Cleanup for the packager to use git tag in the package profile naming. Added conditional check for directory structure, this is in prep for v0.3.1, as this will create a failure on upgrade path in package due to file exist * added a toml configuration file with comments describing each flag (#607) * added a toml configuration file with comments describing each flag * internal/cli/server: update flag description * docs/cli: update example config and description of flags * docs: update new-cli docs Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * Adding of 0.3.0 package changes, control file updates, postinst changes, and packager update * added ancient datadir flag and toml field, need to decide on default value and update the conversion script * updated toml files with ancient field * Add support for new flags in new config.toml, which were present in old config.toml (#612) * added HTTPTimeouts, and TrieTimeout flag in new tol, from old toml * added RAW fields for these time.Duration flags * updated the conversion script to support these extra 4 flags * removed hcl and json config tests as we are only supporting toml config files * updated toml files with cache.timeout field * updated toml files with jsonrpc.timeouts field * tests/bor: expect a call for latest checkpoint * tests/bor: expect a call for latest checkpoint * packaging/templates: update cache values for archive nodes Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * remove unwanted code * Fix docker publish authentication issue In gorelease-cross 1.19+, dockerhub authentication will require docker logion action followed by mounting docker config file. See https://github.com/goreleaser/goreleaser-cross#github-actions. * Revert "update Docker login for goreleaser-cross v1.19" This reverts commit4d19cf5342. * Bump version to stable * Revert "Merge pull request #435 from maticnetwork/POS-553" This reverts commit657d262def, reversing changes made to88dbfa1c13. * revert change for release for go1.19 * Add default values to CLI helper and docs This commit adds default values to CLI helper and docs. When the default value of a string flag, slice string flag, or map string flag is empty, its helper message won't show any default value. * Add a summary of new CLI in docs * Updating packager as binutils changed version so that apt-get installs current versions * Add state pruning to new CLI * Minor wording fix in prune state description * Bumping control file versions * Mainnet Delhi fork * Set version to stable * change delhi hardfork block number * handle future chain import and skip peer drop (#650) * handle future chain import and skip peer drop * add block import metric * params: bump version to v0.3.3-stable * Bump bor version in control files for v0.3.3 mainnet release * Added checks to RPC requests and introduced new flags to customise the parameters (#657) * added a check to reject rpc requests with batch size > the one set using a newly added flag (rpcbatchlimit) * added a check to reject rpc requests whose result size > the one set using a newly added flag (rpcreturndatalimit) * updated the config files and docs * chg : trieTimeout from 60 to 10 mins (#692) * chg : trieTimeout from 60 to 10 mins * chg : cache.timout to 10m from 1h in configs * internal/cli/server : fix : added triesInMemory in config (#691) * changed version from 0.3.0 to 0.3.4-beta (#693) * fix nil state-sync issue, increase grpc limit (#695) * Increase grpc message size limit in pprof * consensus/bor/bor.go : stateSyncs init fixed [Fix #686] * eth/filters: handle nil state-sync before notify * eth/filters: update check Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> * core, tests/bor: add more tests for state-sync validation (#710) * core: add get state sync function for tests * tests/bor: add validation for state sync events post consensus * Arpit/temp bor sync (#701) * Increase grpc message size limit in pprof * ReadBorReceipts improvements * use internal function * fix tests * fetch geth upstread for ReadBorReceiptRLP * Only query bor receipt when the query index is equal to # tx in block body This change reduces the frequency of calling ReadBorReceipt and ReadBorTransaction, which are CPU and db intensive. * Revert "fetch geth upstread for ReadBorReceiptRLP" This reverts commit 2e838a6b1313d26674f3a8df4b044e35dcbf35a0. * Restore ReadBorReceiptRLP * fix bor receipts * remove unused * fix lints --------- Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Revert "chg : trieTimeout from 60 to 10 mins (#692)" (#720) This reverts commit241843c7e7. * Arpit/add execution pool 2 (#719) * initial * linters * linters * remove timeout * update pool * change pool size function * check nil * check nil * fix tests * Use execution pool from server in all handlers * simplify things * test fix * add support for cli, config * add to cli and config * merge base branch * debug statements * fix bug * atomic pointer timeout * add apis * update workerpool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * fix tests * mutex * refactor flag and value names * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * debug statements * fix bug * update workerpool * atomic pointer timeout * add apis * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * merge base branch * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * mutex * fix tests * Merge branch 'arpit/add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * Change default size of execution pool to 40 * refactor flag and value names * fix merge conflicts * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * fix linters * fix go.mod * change sec to ms * change default value for ep timeout * fix node api calls * comment setter for ep timeout --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * version change (#721) * Event based pprof (#732) * feature * Save pprof to /tmp --------- Co-authored-by: Jerry <jerrycgh@gmail.com> * Cherry-pick changes from develop (#738) * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) --------- Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * add max code init size check in txpool (#739) * Revert "Event based pprof" and update version (#742) * Revert "Event based pprof (#732)" This reverts commit22fa4033e8. * params: update version to 0.3.4-beta3 * packaging/templates: update bor version * internal/ethapi :: Fix : newRPCTransactionFromBlockIndex * Merge master to qa (#813) * Merge qa to master (#750) * Added checks to RPC requests and introduced new flags to customise the parameters (#657) * added a check to reject rpc requests with batch size > the one set using a newly added flag (rpcbatchlimit) * added a check to reject rpc requests whose result size > the one set using a newly added flag (rpcreturndatalimit) * updated the config files and docs * chg : trieTimeout from 60 to 10 mins (#692) * chg : trieTimeout from 60 to 10 mins * chg : cache.timout to 10m from 1h in configs * internal/cli/server : fix : added triesInMemory in config (#691) * changed version from 0.3.0 to 0.3.4-beta (#693) * fix nil state-sync issue, increase grpc limit (#695) * Increase grpc message size limit in pprof * consensus/bor/bor.go : stateSyncs init fixed [Fix #686] * eth/filters: handle nil state-sync before notify * eth/filters: update check Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> * core, tests/bor: add more tests for state-sync validation (#710) * core: add get state sync function for tests * tests/bor: add validation for state sync events post consensus * Arpit/temp bor sync (#701) * Increase grpc message size limit in pprof * ReadBorReceipts improvements * use internal function * fix tests * fetch geth upstread for ReadBorReceiptRLP * Only query bor receipt when the query index is equal to # tx in block body This change reduces the frequency of calling ReadBorReceipt and ReadBorTransaction, which are CPU and db intensive. * Revert "fetch geth upstread for ReadBorReceiptRLP" This reverts commit 2e838a6b1313d26674f3a8df4b044e35dcbf35a0. * Restore ReadBorReceiptRLP * fix bor receipts * remove unused * fix lints --------- Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Revert "chg : trieTimeout from 60 to 10 mins (#692)" (#720) This reverts commit241843c7e7. * Arpit/add execution pool 2 (#719) * initial * linters * linters * remove timeout * update pool * change pool size function * check nil * check nil * fix tests * Use execution pool from server in all handlers * simplify things * test fix * add support for cli, config * add to cli and config * merge base branch * debug statements * fix bug * atomic pointer timeout * add apis * update workerpool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * fix tests * mutex * refactor flag and value names * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * debug statements * fix bug * update workerpool * atomic pointer timeout * add apis * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * merge base branch * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * mutex * fix tests * Merge branch 'arpit/add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * Change default size of execution pool to 40 * refactor flag and value names * fix merge conflicts * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * fix linters * fix go.mod * change sec to ms * change default value for ep timeout * fix node api calls * comment setter for ep timeout --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * version change (#721) * Event based pprof (#732) * feature * Save pprof to /tmp --------- Co-authored-by: Jerry <jerrycgh@gmail.com> * Cherry-pick changes from develop (#738) * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) --------- Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * add max code init size check in txpool (#739) * Revert "Event based pprof" and update version (#742) * Revert "Event based pprof (#732)" This reverts commit22fa4033e8. * params: update version to 0.3.4-beta3 * packaging/templates: update bor version * params, packaging/templates: update bor version --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * core, miner: add sub-spans for tracing (#753) * core, miner: add sub-spans for tracing * fix linters * core: add logs for debugging * core: add more logs to print tdd while reorg * fix linters * core: minor fix * core: remove debug logs * core: use different span for write block and set head * core: use internal context for sending traces (#755) * core: add : impossible reorg block dump (#754) * add : impossible reorg block dump * chg : 3 seperate files for impossoble reorg dump * add : use exportBlocks method and RLP blocks before writing * chg : small changes * bump : go version from 1.19 to 1.20.1 (#761) * Revert "bump : go version from 1.19 to 1.20.1 (#761)" This reverts commit4561012af9. * core/vm: use optimized bigint (#26021) * Add holiman/big * Fix linter * Bump version to v0.3.5 * fix lints from develop (few lints decided to appear from code that was untouched, weird) * upgrade crypto lib version (#770) * bump dep : github.com/Masterminds/goutils to v1.1.1 (#769) * mardizzone/pos-1313: bump crypto dependency (#772) * dev: chg: bumd net dependency * dev: chg: bump crypto dependency * dev: chg: bump crypto dependency * bump dep : golang.org/x/net to v0.8.0 (#771) * Verify validator set against local contract on receiving an end-of-sprint block (#768) * Verify validator set against local contract on receiving an end-of-sprint block * Fix tests * Respect error returned by ParseValidators * Keep going back until a parent block presents * core/txpool: implement DoS defenses from geth (#778) * Hotfixes and deps bump (#776) * dev: chg: bump deps * internal/cli/server, rpc: lower down http readtimeout to 10s * dev: chg: get p2p adapter * dev: chg: lower down jsonrpc readtimeout to 10s * cherry-pick txpool optimisation changes * add check for empty lists in txpool (#704) * add check * linters * core, miner: add empty instrumentation name for tracing --------- Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Evgeny Danilenko <6655321@bk.ru> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * packaging,params: bump to v0.3.6 (#782) * v0.3.6 fix (#787) * Fix get validator set in header verifier * chg : commit tx logs from info to debug (#673) * chg : commit tx logs from info to debug * fix : minor changes * chg : miner : commitTransactions-stats moved from info to debug * lint : fix linters * refactor logging * miner : chg : UnauthorizedSignerError to debug * lint : fix lint * fix : log.Logger interface compatibility --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Remove unnecessary sorting of valset from header in verification * dev: chg: version bump --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> * core: improve locks in txpool (#807) * added a write lock to the txs.filter method and a read lock to the txs.reheap method - both of which are called by Filter during reorg adjustments to txpool * txpool reorg locks * more locks * locks * linters * params, packaging: update version for v0.3.8-beta release * core: add logs in reheap --------- Co-authored-by: Alex <dalexwatts@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Merge qa to master (#808) * Added checks to RPC requests and introduced new flags to customise the parameters (#657) * added a check to reject rpc requests with batch size > the one set using a newly added flag (rpcbatchlimit) * added a check to reject rpc requests whose result size > the one set using a newly added flag (rpcreturndatalimit) * updated the config files and docs * chg : trieTimeout from 60 to 10 mins (#692) * chg : trieTimeout from 60 to 10 mins * chg : cache.timout to 10m from 1h in configs * internal/cli/server : fix : added triesInMemory in config (#691) * changed version from 0.3.0 to 0.3.4-beta (#693) * fix nil state-sync issue, increase grpc limit (#695) * Increase grpc message size limit in pprof * consensus/bor/bor.go : stateSyncs init fixed [Fix #686] * eth/filters: handle nil state-sync before notify * eth/filters: update check Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> * core, tests/bor: add more tests for state-sync validation (#710) * core: add get state sync function for tests * tests/bor: add validation for state sync events post consensus * Arpit/temp bor sync (#701) * Increase grpc message size limit in pprof * ReadBorReceipts improvements * use internal function * fix tests * fetch geth upstread for ReadBorReceiptRLP * Only query bor receipt when the query index is equal to # tx in block body This change reduces the frequency of calling ReadBorReceipt and ReadBorTransaction, which are CPU and db intensive. * Revert "fetch geth upstread for ReadBorReceiptRLP" This reverts commit 2e838a6b1313d26674f3a8df4b044e35dcbf35a0. * Restore ReadBorReceiptRLP * fix bor receipts * remove unused * fix lints --------- Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> * Revert "chg : trieTimeout from 60 to 10 mins (#692)" (#720) This reverts commit241843c7e7. * Arpit/add execution pool 2 (#719) * initial * linters * linters * remove timeout * update pool * change pool size function * check nil * check nil * fix tests * Use execution pool from server in all handlers * simplify things * test fix * add support for cli, config * add to cli and config * merge base branch * debug statements * fix bug * atomic pointer timeout * add apis * update workerpool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * fix tests * mutex * refactor flag and value names * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * debug statements * fix bug * update workerpool * atomic pointer timeout * add apis * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * fix issues * change params * fix issues * fix ipc issue * remove execution pool from IPC * revert * merge base branch * Merge branch 'add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * mutex * fix tests * Merge branch 'arpit/add-execution-pool' of github.com:maticnetwork/bor into arpit/add-execution-pool * Change default size of execution pool to 40 * refactor flag and value names * fix merge conflicts * ordering fix * refactor flag and value names * update default ep size to 40 * fix bor start issues * revert file changes * fix linters * fix go.mod * change sec to ms * change default value for ep timeout * fix node api calls * comment setter for ep timeout --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> * version change (#721) * Event based pprof (#732) * feature * Save pprof to /tmp --------- Co-authored-by: Jerry <jerrycgh@gmail.com> * Cherry-pick changes from develop (#738) * Check if block is nil to prevent panic (#736) * miner: use env for tracing instead of block object (#728) --------- Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * add max code init size check in txpool (#739) * Revert "Event based pprof" and update version (#742) * Revert "Event based pprof (#732)" This reverts commit22fa4033e8. * params: update version to 0.3.4-beta3 * packaging/templates: update bor version * internal/ethapi :: Fix : newRPCTransactionFromBlockIndex * fix: remove assignment for bor receipt --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> * Setting up bor to use hosted 18.04 runner as ubuntu provided 18.04 runner is end of life --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Alex <dalexwatts@gmail.com> Co-authored-by: Daniel Jones <djones@polygon.technology> * core: remove duplicate tests * miner: use get validators by hash in tests --------- Co-authored-by: Daniel Jones <djones@polygon.technology> Co-authored-by: Will Button <wbutton@polygon.technology> Co-authored-by: Will Button <will@willbutton.com> Co-authored-by: Daniel Jones <105369507+djpolygon@users.noreply.github.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: marcello33 <marcelloardizzone@hotmail.it> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Alex <dalexwatts@gmail.com> --------- Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: builder90210 <anonbuilder90210@gmail.com> Co-authored-by: Krishna Upadhyaya <KRISHNAU1604@GMAIL.COM> Co-authored-by: Daniel Jones <djones@polygon.technology> Co-authored-by: Will Button <wbutton@polygon.technology> Co-authored-by: Will Button <will@willbutton.com> Co-authored-by: Daniel Jones <105369507+djpolygon@users.noreply.github.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Didi <github@d10r.net> Co-authored-by: ephess <e+github@ephess.nz> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Alex <dalexwatts@gmail.com> * dev: chg: version bump for v0.3.9-beta (#825) * eth/fetcher: if peers never respond, drop them (#837) (#844) * dev: chg: bump version to beta-2 for v0.3.9 (#845) * rm : disable interruptCommit on txsCh select case (#848) * dev: chg: version bump (#849) * fix : go-routine leak in commitInterrupt channel (#851) * fix : go-routine leak in commitInterrupt channel * fix : fix lint * rm : remove t.Parallel() from TestGenerateBlockAndImport tests * fix : minor optimisations in test * fix : BenchmarkBorMining * dev: chg: beta version bump (#853) * dev: chg: bump version to stable * dev: chg: contracts branch * dev: fix: linter * dev: chg: update templum/govulncheck-action to fix execution --------- Co-authored-by: SHIVAM SHARMA <shivam691999@gmail.com> Co-authored-by: Pratik Patil <pratikspatil024@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Daniil <daniil.melnik@chainstack.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Evgeny Danienko <6655321@bk.ru> Co-authored-by: Dmitry <46797839+dkeysil@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Alex <dalexwatts@gmail.com> Co-authored-by: Daniel Jones <djones@polygon.technology> Co-authored-by: builder90210 <anonbuilder90210@gmail.com> Co-authored-by: Krishna Upadhyaya <KRISHNAU1604@GMAIL.COM> Co-authored-by: Will Button <wbutton@polygon.technology> Co-authored-by: Will Button <will@willbutton.com> Co-authored-by: Daniel Jones <105369507+djpolygon@users.noreply.github.com> Co-authored-by: Didi <github@d10r.net> Co-authored-by: ephess <e+github@ephess.nz>
784 lines
22 KiB
Go
784 lines
22 KiB
Go
package valset
|
|
|
|
// Tendermint leader selection algorithm
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"math"
|
|
"math/big"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
)
|
|
|
|
// MaxTotalVotingPower - the maximum allowed total voting power.
|
|
// It needs to be sufficiently small to, in all cases:
|
|
// 1. prevent clipping in incrementProposerPriority()
|
|
// 2. let (diff+diffMax-1) not overflow in IncrementProposerPriority()
|
|
// (Proof of 1 is tricky, left to the reader).
|
|
// It could be higher, but this is sufficiently large for our purposes,
|
|
// and leaves room for defensive purposes.
|
|
// PriorityWindowSizeFactor - is a constant that when multiplied with the total voting power gives
|
|
// the maximum allowed distance between validator priorities.
|
|
|
|
const (
|
|
MaxTotalVotingPower = int64(math.MaxInt64) / 8
|
|
PriorityWindowSizeFactor = 2
|
|
)
|
|
|
|
// ValidatorSet represent a set of *Validator at a given height.
|
|
// The validators can be fetched by address or index.
|
|
// The index is in order of .Address, so the indices are fixed
|
|
// for all rounds of a given blockchain height - ie. the validators
|
|
// are sorted by their address.
|
|
// On the other hand, the .ProposerPriority of each validator and
|
|
// the designated .GetProposer() of a set changes every round,
|
|
// upon calling .IncrementProposerPriority().
|
|
// NOTE: Not goroutine-safe.
|
|
// NOTE: All get/set to validators should copy the value for safety.
|
|
type ValidatorSet struct {
|
|
// NOTE: persisted via reflect, must be exported.
|
|
Validators []*Validator `json:"validators"`
|
|
Proposer *Validator `json:"proposer"`
|
|
|
|
// cached (unexported)
|
|
totalVotingPower int64
|
|
validatorsMap map[common.Address]int // address -> index
|
|
}
|
|
|
|
// NewValidatorSet initializes a ValidatorSet by copying over the
|
|
// values from `valz`, a list of Validators. If valz is nil or empty,
|
|
// the new ValidatorSet will have an empty list of Validators.
|
|
// The addresses of validators in `valz` must be unique otherwise the
|
|
// function panics.
|
|
func NewValidatorSet(valz []*Validator) *ValidatorSet {
|
|
vals := &ValidatorSet{validatorsMap: make(map[common.Address]int)}
|
|
|
|
err := vals.updateWithChangeSet(valz, false)
|
|
if err != nil {
|
|
panic(fmt.Sprintf("cannot create validator set: %s", err))
|
|
}
|
|
|
|
if len(valz) > 0 {
|
|
vals.IncrementProposerPriority(1)
|
|
}
|
|
|
|
return vals
|
|
}
|
|
|
|
// Nil or empty validator sets are invalid.
|
|
func (vals *ValidatorSet) IsNilOrEmpty() bool {
|
|
return vals == nil || len(vals.Validators) == 0
|
|
}
|
|
|
|
// Increment ProposerPriority and update the proposer on a copy, and return it.
|
|
func (vals *ValidatorSet) CopyIncrementProposerPriority(times int) *ValidatorSet {
|
|
validatorCopy := vals.Copy()
|
|
validatorCopy.IncrementProposerPriority(times)
|
|
|
|
return validatorCopy
|
|
}
|
|
|
|
// IncrementProposerPriority increments ProposerPriority of each validator and updates the
|
|
// proposer. Panics if validator set is empty.
|
|
// `times` must be positive.
|
|
func (vals *ValidatorSet) IncrementProposerPriority(times int) {
|
|
if vals.IsNilOrEmpty() {
|
|
panic("empty validator set")
|
|
}
|
|
|
|
if times <= 0 {
|
|
panic("Cannot call IncrementProposerPriority with non-positive times")
|
|
}
|
|
|
|
// Cap the difference between priorities to be proportional to 2*totalPower by
|
|
// re-normalizing priorities, i.e., rescale all priorities by multiplying with:
|
|
// 2*totalVotingPower/(maxPriority - minPriority)
|
|
diffMax := PriorityWindowSizeFactor * vals.TotalVotingPower()
|
|
vals.RescalePriorities(diffMax)
|
|
vals.shiftByAvgProposerPriority()
|
|
|
|
var proposer *Validator
|
|
// Call IncrementProposerPriority(1) times times.
|
|
for i := 0; i < times; i++ {
|
|
proposer = vals.incrementProposerPriority()
|
|
}
|
|
|
|
vals.Proposer = proposer
|
|
}
|
|
|
|
func (vals *ValidatorSet) RescalePriorities(diffMax int64) {
|
|
if vals.IsNilOrEmpty() {
|
|
panic("empty validator set")
|
|
}
|
|
// NOTE: This check is merely a sanity check which could be
|
|
// removed if all tests would init. voting power appropriately;
|
|
// i.e. diffMax should always be > 0
|
|
if diffMax <= 0 {
|
|
return
|
|
}
|
|
|
|
// Calculating ceil(diff/diffMax):
|
|
// Re-normalization is performed by dividing by an integer for simplicity.
|
|
// NOTE: This may make debugging priority issues easier as well.
|
|
diff := computeMaxMinPriorityDiff(vals)
|
|
ratio := (diff + diffMax - 1) / diffMax
|
|
|
|
if diff > diffMax {
|
|
for _, val := range vals.Validators {
|
|
val.ProposerPriority = val.ProposerPriority / ratio
|
|
}
|
|
}
|
|
}
|
|
|
|
func (vals *ValidatorSet) incrementProposerPriority() *Validator {
|
|
for _, val := range vals.Validators {
|
|
// Check for overflow for sum.
|
|
newPrio := safeAddClip(val.ProposerPriority, val.VotingPower)
|
|
val.ProposerPriority = newPrio
|
|
}
|
|
// Decrement the validator with most ProposerPriority.
|
|
mostest := vals.getValWithMostPriority()
|
|
// Mind the underflow.
|
|
mostest.ProposerPriority = safeSubClip(mostest.ProposerPriority, vals.TotalVotingPower())
|
|
|
|
return mostest
|
|
}
|
|
|
|
// Should not be called on an empty validator set.
|
|
func (vals *ValidatorSet) computeAvgProposerPriority() int64 {
|
|
n := int64(len(vals.Validators))
|
|
sum := big.NewInt(0)
|
|
|
|
for _, val := range vals.Validators {
|
|
sum.Add(sum, big.NewInt(val.ProposerPriority))
|
|
}
|
|
|
|
avg := sum.Div(sum, big.NewInt(n))
|
|
|
|
if avg.IsInt64() {
|
|
return avg.Int64()
|
|
}
|
|
|
|
// This should never happen: each val.ProposerPriority is in bounds of int64.
|
|
panic(fmt.Sprintf("Cannot represent avg ProposerPriority as an int64 %v", avg))
|
|
}
|
|
|
|
// Compute the difference between the max and min ProposerPriority of that set.
|
|
func computeMaxMinPriorityDiff(vals *ValidatorSet) int64 {
|
|
if vals.IsNilOrEmpty() {
|
|
panic("empty validator set")
|
|
}
|
|
|
|
max := int64(math.MinInt64)
|
|
min := int64(math.MaxInt64)
|
|
|
|
for _, v := range vals.Validators {
|
|
if v.ProposerPriority < min {
|
|
min = v.ProposerPriority
|
|
}
|
|
|
|
if v.ProposerPriority > max {
|
|
max = v.ProposerPriority
|
|
}
|
|
}
|
|
|
|
diff := max - min
|
|
|
|
if diff < 0 {
|
|
return -1 * diff
|
|
} else {
|
|
return diff
|
|
}
|
|
}
|
|
|
|
func (vals *ValidatorSet) getValWithMostPriority() *Validator {
|
|
var res *Validator
|
|
for _, val := range vals.Validators {
|
|
res = res.Cmp(val)
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
func (vals *ValidatorSet) shiftByAvgProposerPriority() {
|
|
if vals.IsNilOrEmpty() {
|
|
panic("empty validator set")
|
|
}
|
|
|
|
avgProposerPriority := vals.computeAvgProposerPriority()
|
|
|
|
for _, val := range vals.Validators {
|
|
val.ProposerPriority = safeSubClip(val.ProposerPriority, avgProposerPriority)
|
|
}
|
|
}
|
|
|
|
// Makes a copy of the validator list.
|
|
func validatorListCopy(valsList []*Validator) []*Validator {
|
|
if valsList == nil {
|
|
return nil
|
|
}
|
|
|
|
valsCopy := make([]*Validator, len(valsList))
|
|
|
|
for i, val := range valsList {
|
|
valsCopy[i] = val.Copy()
|
|
}
|
|
|
|
return valsCopy
|
|
}
|
|
|
|
// Copy each validator into a new ValidatorSet.
|
|
func (vals *ValidatorSet) Copy() *ValidatorSet {
|
|
valCopy := validatorListCopy(vals.Validators)
|
|
validatorsMap := make(map[common.Address]int, len(vals.Validators))
|
|
|
|
for i, val := range valCopy {
|
|
validatorsMap[val.Address] = i
|
|
}
|
|
|
|
return &ValidatorSet{
|
|
Validators: validatorListCopy(vals.Validators),
|
|
Proposer: vals.Proposer,
|
|
totalVotingPower: vals.totalVotingPower,
|
|
validatorsMap: validatorsMap,
|
|
}
|
|
}
|
|
|
|
// HasAddress returns true if address given is in the validator set, false -
|
|
// otherwise.
|
|
func (vals *ValidatorSet) HasAddress(address common.Address) bool {
|
|
_, ok := vals.validatorsMap[address]
|
|
|
|
return ok
|
|
}
|
|
|
|
// GetByAddress returns an index of the validator with address and validator
|
|
// itself if found. Otherwise, -1 and nil are returned.
|
|
func (vals *ValidatorSet) GetByAddress(address common.Address) (index int, val *Validator) {
|
|
idx, ok := vals.validatorsMap[address]
|
|
if ok {
|
|
return idx, vals.Validators[idx].Copy()
|
|
}
|
|
|
|
return -1, nil
|
|
}
|
|
|
|
// GetByIndex returns the validator's address and validator itself by index.
|
|
// It returns nil values if index is less than 0 or greater or equal to
|
|
// len(ValidatorSet.Validators).
|
|
func (vals *ValidatorSet) GetByIndex(index int) (address common.Address, val *Validator) {
|
|
if index < 0 || index >= len(vals.Validators) {
|
|
return common.Address{}, nil
|
|
}
|
|
|
|
val = vals.Validators[index]
|
|
|
|
return val.Address, val.Copy()
|
|
}
|
|
|
|
// Size returns the length of the validator set.
|
|
func (vals *ValidatorSet) Size() int {
|
|
return len(vals.Validators)
|
|
}
|
|
|
|
// Force recalculation of the set's total voting power.
|
|
func (vals *ValidatorSet) UpdateTotalVotingPower() error {
|
|
sum := int64(0)
|
|
for _, val := range vals.Validators {
|
|
// mind overflow
|
|
sum = safeAddClip(sum, val.VotingPower)
|
|
if sum > MaxTotalVotingPower {
|
|
return &TotalVotingPowerExceededError{sum, vals.Validators}
|
|
}
|
|
}
|
|
|
|
vals.totalVotingPower = sum
|
|
|
|
return nil
|
|
}
|
|
|
|
// TotalVotingPower returns the sum of the voting powers of all validators.
|
|
// It recomputes the total voting power if required.
|
|
func (vals *ValidatorSet) TotalVotingPower() int64 {
|
|
if vals.totalVotingPower == 0 {
|
|
log.Debug("invoking updateTotalVotingPower before returning it")
|
|
|
|
if err := vals.UpdateTotalVotingPower(); err != nil {
|
|
// Can/should we do better?
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
return vals.totalVotingPower
|
|
}
|
|
|
|
// GetProposer returns the current proposer. If the validator set is empty, nil
|
|
// is returned.
|
|
func (vals *ValidatorSet) GetProposer() (proposer *Validator) {
|
|
if len(vals.Validators) == 0 {
|
|
return nil
|
|
}
|
|
|
|
if vals.Proposer == nil {
|
|
vals.Proposer = vals.findProposer()
|
|
}
|
|
|
|
return vals.Proposer.Copy()
|
|
}
|
|
|
|
func (vals *ValidatorSet) findProposer() *Validator {
|
|
var proposer *Validator
|
|
for _, val := range vals.Validators {
|
|
if proposer == nil || val.Address != proposer.Address {
|
|
proposer = proposer.Cmp(val)
|
|
}
|
|
}
|
|
|
|
return proposer
|
|
}
|
|
|
|
// Hash returns the Merkle root hash build using validators (as leaves) in the
|
|
// set.
|
|
// func (vals *ValidatorSet) Hash() []byte {
|
|
// if len(vals.Validators) == 0 {
|
|
// return nil
|
|
// }
|
|
// bzs := make([][]byte, len(vals.Validators))
|
|
// for i, val := range vals.Validators {
|
|
// bzs[i] = val.Bytes()
|
|
// }
|
|
// return merkle.SimpleHashFromByteSlices(bzs)
|
|
// }
|
|
|
|
// Iterate will run the given function over the set.
|
|
func (vals *ValidatorSet) Iterate(fn func(index int, val *Validator) bool) {
|
|
for i, val := range vals.Validators {
|
|
stop := fn(i, val.Copy())
|
|
if stop {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// Checks changes against duplicates, splits the changes in updates and removals, sorts them by address.
|
|
//
|
|
// Returns:
|
|
// updates, removals - the sorted lists of updates and removals
|
|
// err - non-nil if duplicate entries or entries with negative voting power are seen
|
|
//
|
|
// No changes are made to 'origChanges'.
|
|
func processChanges(origChanges []*Validator) (updates, removals []*Validator, err error) {
|
|
// Make a deep copy of the changes and sort by address.
|
|
changes := validatorListCopy(origChanges)
|
|
sort.Sort(ValidatorsByAddress(changes))
|
|
|
|
sliceCap := len(changes) / 2
|
|
if sliceCap == 0 {
|
|
sliceCap = 1
|
|
}
|
|
|
|
removals = make([]*Validator, 0, sliceCap)
|
|
updates = make([]*Validator, 0, sliceCap)
|
|
|
|
var prevAddr common.Address
|
|
|
|
// Scan changes by address and append valid validators to updates or removals lists.
|
|
for _, valUpdate := range changes {
|
|
if valUpdate.Address == prevAddr {
|
|
err = fmt.Errorf("duplicate entry %v in %v", valUpdate, changes)
|
|
return nil, nil, err
|
|
}
|
|
|
|
if valUpdate.VotingPower < 0 {
|
|
err = fmt.Errorf("voting power can't be negative: %v", valUpdate)
|
|
return nil, nil, err
|
|
}
|
|
|
|
if valUpdate.VotingPower > MaxTotalVotingPower {
|
|
err = fmt.Errorf("to prevent clipping/ overflow, voting power can't be higher than %v: %v ",
|
|
MaxTotalVotingPower, valUpdate)
|
|
return nil, nil, err
|
|
}
|
|
|
|
if valUpdate.VotingPower == 0 {
|
|
removals = append(removals, valUpdate)
|
|
} else {
|
|
updates = append(updates, valUpdate)
|
|
}
|
|
|
|
prevAddr = valUpdate.Address
|
|
}
|
|
|
|
return updates, removals, err
|
|
}
|
|
|
|
// Verifies a list of updates against a validator set, making sure the allowed
|
|
// total voting power would not be exceeded if these updates would be applied to the set.
|
|
//
|
|
// Returns:
|
|
// updatedTotalVotingPower - the new total voting power if these updates would be applied
|
|
// numNewValidators - number of new validators
|
|
// err - non-nil if the maximum allowed total voting power would be exceeded
|
|
//
|
|
// 'updates' should be a list of proper validator changes, i.e. they have been verified
|
|
// by processChanges for duplicates and invalid values.
|
|
// No changes are made to the validator set 'vals'.
|
|
func verifyUpdates(updates []*Validator, vals *ValidatorSet) (updatedTotalVotingPower int64, numNewValidators int, err error) {
|
|
updatedTotalVotingPower = vals.TotalVotingPower()
|
|
|
|
for _, valUpdate := range updates {
|
|
address := valUpdate.Address
|
|
_, val := vals.GetByAddress(address)
|
|
|
|
if val == nil {
|
|
// New validator, add its voting power the the total.
|
|
updatedTotalVotingPower += valUpdate.VotingPower
|
|
numNewValidators++
|
|
} else {
|
|
// Updated validator, add the difference in power to the total.
|
|
updatedTotalVotingPower += valUpdate.VotingPower - val.VotingPower
|
|
}
|
|
|
|
overflow := updatedTotalVotingPower > MaxTotalVotingPower
|
|
|
|
if overflow {
|
|
err = fmt.Errorf(
|
|
"failed to add/update validator %v, total voting power would exceed the max allowed %v",
|
|
valUpdate, MaxTotalVotingPower)
|
|
|
|
return 0, 0, err
|
|
}
|
|
}
|
|
|
|
return updatedTotalVotingPower, numNewValidators, nil
|
|
}
|
|
|
|
// Computes the proposer priority for the validators not present in the set based on 'updatedTotalVotingPower'.
|
|
// Leaves unchanged the priorities of validators that are changed.
|
|
//
|
|
// 'updates' parameter must be a list of unique validators to be added or updated.
|
|
// No changes are made to the validator set 'vals'.
|
|
func computeNewPriorities(updates []*Validator, vals *ValidatorSet, updatedTotalVotingPower int64) {
|
|
for _, valUpdate := range updates {
|
|
address := valUpdate.Address
|
|
_, val := vals.GetByAddress(address)
|
|
|
|
if val == nil {
|
|
// add val
|
|
// Set ProposerPriority to -C*totalVotingPower (with C ~= 1.125) to make sure validators can't
|
|
// un-bond and then re-bond to reset their (potentially previously negative) ProposerPriority to zero.
|
|
//
|
|
// Contract: updatedVotingPower < MaxTotalVotingPower to ensure ProposerPriority does
|
|
// not exceed the bounds of int64.
|
|
//
|
|
// Compute ProposerPriority = -1.125*totalVotingPower == -(updatedVotingPower + (updatedVotingPower >> 3)).
|
|
valUpdate.ProposerPriority = -(updatedTotalVotingPower + (updatedTotalVotingPower >> 3))
|
|
} else {
|
|
valUpdate.ProposerPriority = val.ProposerPriority
|
|
}
|
|
}
|
|
}
|
|
|
|
// Merges the vals' validator list with the updates list.
|
|
// When two elements with same address are seen, the one from updates is selected.
|
|
// Expects updates to be a list of updates sorted by address with no duplicates or errors,
|
|
// must have been validated with verifyUpdates() and priorities computed with computeNewPriorities().
|
|
func (vals *ValidatorSet) applyUpdates(updates []*Validator) {
|
|
existing := vals.Validators
|
|
merged := make([]*Validator, len(existing)+len(updates))
|
|
i := 0
|
|
|
|
for len(existing) > 0 && len(updates) > 0 {
|
|
if bytes.Compare(existing[0].Address.Bytes(), updates[0].Address.Bytes()) < 0 { // unchanged validator
|
|
merged[i] = existing[0]
|
|
existing = existing[1:]
|
|
} else {
|
|
// Apply add or update.
|
|
merged[i] = updates[0]
|
|
if existing[0].Address == updates[0].Address {
|
|
// Validator is present in both, advance existing.
|
|
existing = existing[1:]
|
|
}
|
|
|
|
updates = updates[1:]
|
|
}
|
|
i++
|
|
}
|
|
|
|
// Add the elements which are left.
|
|
for j := 0; j < len(existing); j++ {
|
|
merged[i] = existing[j]
|
|
i++
|
|
}
|
|
|
|
// OR add updates which are left.
|
|
for j := 0; j < len(updates); j++ {
|
|
merged[i] = updates[j]
|
|
i++
|
|
}
|
|
|
|
vals.Validators = merged[:i]
|
|
}
|
|
|
|
// Checks that the validators to be removed are part of the validator set.
|
|
// No changes are made to the validator set 'vals'.
|
|
func verifyRemovals(deletes []*Validator, vals *ValidatorSet) error {
|
|
for _, valUpdate := range deletes {
|
|
address := valUpdate.Address
|
|
_, val := vals.GetByAddress(address)
|
|
|
|
if val == nil {
|
|
return fmt.Errorf("failed to find validator %X to remove", address)
|
|
}
|
|
}
|
|
|
|
if len(deletes) > len(vals.Validators) {
|
|
panic("more deletes than validators")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Removes the validators specified in 'deletes' from validator set 'vals'.
|
|
// Should not fail as verification has been done before.
|
|
func (vals *ValidatorSet) applyRemovals(deletes []*Validator) {
|
|
existing := vals.Validators
|
|
|
|
merged := make([]*Validator, len(existing)-len(deletes))
|
|
i := 0
|
|
|
|
// Loop over deletes until we removed all of them.
|
|
for len(deletes) > 0 {
|
|
if existing[0].Address == deletes[0].Address {
|
|
deletes = deletes[1:]
|
|
} else { // Leave it in the resulting slice.
|
|
merged[i] = existing[0]
|
|
i++
|
|
}
|
|
|
|
existing = existing[1:]
|
|
}
|
|
|
|
// Add the elements which are left.
|
|
for j := 0; j < len(existing); j++ {
|
|
merged[i] = existing[j]
|
|
i++
|
|
}
|
|
|
|
vals.Validators = merged[:i]
|
|
}
|
|
|
|
// Main function used by UpdateWithChangeSet() and NewValidatorSet().
|
|
// If 'allowDeletes' is false then delete operations (identified by validators with voting power 0)
|
|
// are not allowed and will trigger an error if present in 'changes'.
|
|
// The 'allowDeletes' flag is set to false by NewValidatorSet() and to true by UpdateWithChangeSet().
|
|
func (vals *ValidatorSet) updateWithChangeSet(changes []*Validator, allowDeletes bool) error {
|
|
if len(changes) <= 0 {
|
|
return nil
|
|
}
|
|
|
|
// Check for duplicates within changes, split in 'updates' and 'deletes' lists (sorted).
|
|
updates, deletes, err := processChanges(changes)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !allowDeletes && len(deletes) != 0 {
|
|
return fmt.Errorf("cannot process validators with voting power 0: %v", deletes)
|
|
}
|
|
|
|
// Verify that applying the 'deletes' against 'vals' will not result in error.
|
|
if err := verifyRemovals(deletes, vals); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Verify that applying the 'updates' against 'vals' will not result in error.
|
|
updatedTotalVotingPower, numNewValidators, err := verifyUpdates(updates, vals)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Check that the resulting set will not be empty.
|
|
if numNewValidators == 0 && len(vals.Validators) == len(deletes) {
|
|
return fmt.Errorf("applying the validator changes would result in empty set")
|
|
}
|
|
|
|
// Compute the priorities for updates.
|
|
computeNewPriorities(updates, vals, updatedTotalVotingPower)
|
|
|
|
// Apply updates and removals.
|
|
vals.updateValidators(updates, deletes)
|
|
|
|
if err := vals.UpdateTotalVotingPower(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Scale and center.
|
|
vals.RescalePriorities(PriorityWindowSizeFactor * vals.TotalVotingPower())
|
|
vals.shiftByAvgProposerPriority()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (vals *ValidatorSet) updateValidators(updates []*Validator, deletes []*Validator) {
|
|
vals.applyUpdates(updates)
|
|
vals.applyRemovals(deletes)
|
|
|
|
vals.UpdateValidatorMap()
|
|
}
|
|
|
|
func (vals *ValidatorSet) UpdateValidatorMap() {
|
|
vals.validatorsMap = make(map[common.Address]int, len(vals.Validators))
|
|
|
|
for i, val := range vals.Validators {
|
|
vals.validatorsMap[val.Address] = i
|
|
}
|
|
}
|
|
|
|
// UpdateWithChangeSet attempts to update the validator set with 'changes'.
|
|
// It performs the following steps:
|
|
// - validates the changes making sure there are no duplicates and splits them in updates and deletes
|
|
// - verifies that applying the changes will not result in errors
|
|
// - computes the total voting power BEFORE removals to ensure that in the next steps the priorities
|
|
// across old and newly added validators are fair
|
|
// - computes the priorities of new validators against the final set
|
|
// - applies the updates against the validator set
|
|
// - applies the removals against the validator set
|
|
// - performs scaling and centering of priority values
|
|
//
|
|
// If an error is detected during verification steps, it is returned and the validator set
|
|
// is not changed.
|
|
func (vals *ValidatorSet) UpdateWithChangeSet(changes []*Validator) error {
|
|
return vals.updateWithChangeSet(changes, true)
|
|
}
|
|
|
|
//-----------------
|
|
// ErrTooMuchChange
|
|
|
|
func IsErrTooMuchChange(err error) bool {
|
|
switch err.(type) {
|
|
case tooMuchChangeError:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
type tooMuchChangeError struct {
|
|
got int64
|
|
needed int64
|
|
}
|
|
|
|
func (e tooMuchChangeError) Error() string {
|
|
return fmt.Sprintf("Invalid commit -- insufficient old voting power: got %v, needed %v", e.got, e.needed)
|
|
}
|
|
|
|
//----------------
|
|
|
|
func (vals *ValidatorSet) String() string {
|
|
return vals.StringIndented("")
|
|
}
|
|
|
|
func (vals *ValidatorSet) StringIndented(indent string) string {
|
|
if vals == nil {
|
|
return "nil-ValidatorSet"
|
|
}
|
|
|
|
valStrings := make([]string, 0, len(vals.Validators))
|
|
|
|
vals.Iterate(func(index int, val *Validator) bool {
|
|
valStrings = append(valStrings, val.String())
|
|
return false
|
|
})
|
|
|
|
return fmt.Sprintf(`ValidatorSet{
|
|
%s Proposer: %v
|
|
%s Validators:
|
|
%s %v
|
|
%s}`,
|
|
indent, vals.GetProposer().String(),
|
|
indent,
|
|
indent, strings.Join(valStrings, "\n"+indent+" "),
|
|
indent)
|
|
}
|
|
|
|
func (vals *ValidatorSet) SetTotalVotingPower(totalVotingPower int64) {
|
|
vals.totalVotingPower = totalVotingPower
|
|
}
|
|
|
|
func (vals *ValidatorSet) SetMap(validatorsMap map[common.Address]int) {
|
|
vals.validatorsMap = validatorsMap
|
|
}
|
|
|
|
//-------------------------------------
|
|
// Implements sort for sorting validators by address.
|
|
|
|
// Sort validators by address.
|
|
type ValidatorsByAddress []*Validator
|
|
|
|
func (valz ValidatorsByAddress) Len() int {
|
|
return len(valz)
|
|
}
|
|
|
|
func (valz ValidatorsByAddress) Less(i, j int) bool {
|
|
return bytes.Compare(valz[i].Address.Bytes(), valz[j].Address.Bytes()) == -1
|
|
}
|
|
|
|
func (valz ValidatorsByAddress) Swap(i, j int) {
|
|
it := valz[i]
|
|
valz[i] = valz[j]
|
|
valz[j] = it
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// safe addition/subtraction
|
|
|
|
func safeAdd(a, b int64) (int64, bool) {
|
|
if b > 0 && a > math.MaxInt64-b {
|
|
return -1, true
|
|
} else if b < 0 && a < math.MinInt64-b {
|
|
return -1, true
|
|
}
|
|
|
|
return a + b, false
|
|
}
|
|
|
|
func safeSub(a, b int64) (int64, bool) {
|
|
if b > 0 && a < math.MinInt64+b {
|
|
return -1, true
|
|
} else if b < 0 && a > math.MaxInt64+b {
|
|
return -1, true
|
|
}
|
|
|
|
return a - b, false
|
|
}
|
|
|
|
func safeAddClip(a, b int64) int64 {
|
|
c, overflow := safeAdd(a, b)
|
|
if overflow {
|
|
if b < 0 {
|
|
return math.MinInt64
|
|
}
|
|
|
|
return math.MaxInt64
|
|
}
|
|
|
|
return c
|
|
}
|
|
|
|
func safeSubClip(a, b int64) int64 {
|
|
c, overflow := safeSub(a, b)
|
|
if overflow {
|
|
if b > 0 {
|
|
return math.MinInt64
|
|
}
|
|
|
|
return math.MaxInt64
|
|
}
|
|
|
|
return c
|
|
}
|