mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-28 15:46:43 +00:00
* 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>
725 lines
21 KiB
Go
725 lines
21 KiB
Go
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/pelletier/go-toml"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/internal/cli/server"
|
|
)
|
|
|
|
// YesFV: Both, Flags and their values has changed
|
|
// YesF: Only the Flag has changed, not their value
|
|
var flagMap = map[string][]string{
|
|
"networkid": {"notABoolFlag", "YesFV"},
|
|
"miner.gastarget": {"notABoolFlag", "No"},
|
|
"pprof": {"BoolFlag", "No"},
|
|
"pprof.port": {"notABoolFlag", "No"},
|
|
"pprof.addr": {"notABoolFlag", "No"},
|
|
"pprof.memprofilerate": {"notABoolFlag", "No"},
|
|
"pprof.blockprofilerate": {"notABoolFlag", "No"},
|
|
"pprof.cpuprofile": {"notABoolFlag", "No"},
|
|
"jsonrpc.corsdomain": {"notABoolFlag", "YesF"},
|
|
"jsonrpc.vhosts": {"notABoolFlag", "YesF"},
|
|
"http.modules": {"notABoolFlag", "YesF"},
|
|
"ws.modules": {"notABoolFlag", "YesF"},
|
|
"config": {"notABoolFlag", "No"},
|
|
"datadir.ancient": {"notABoolFlag", "No"},
|
|
"datadir.minfreedisk": {"notABoolFlag", "No"},
|
|
"usb": {"BoolFlag", "No"},
|
|
"pcscdpath": {"notABoolFlag", "No"},
|
|
"mainnet": {"BoolFlag", "No"},
|
|
"goerli": {"BoolFlag", "No"},
|
|
"bor-mumbai": {"BoolFlag", "No"},
|
|
"bor-mainnet": {"BoolFlag", "No"},
|
|
"rinkeby": {"BoolFlag", "No"},
|
|
"ropsten": {"BoolFlag", "No"},
|
|
"sepolia": {"BoolFlag", "No"},
|
|
"kiln": {"BoolFlag", "No"},
|
|
"exitwhensynced": {"BoolFlag", "No"},
|
|
"light.serve": {"notABoolFlag", "No"},
|
|
"light.ingress": {"notABoolFlag", "No"},
|
|
"light.egress": {"notABoolFlag", "No"},
|
|
"light.maxpeers": {"notABoolFlag", "No"},
|
|
"ulc.servers": {"notABoolFlag", "No"},
|
|
"ulc.fraction": {"notABoolFlag", "No"},
|
|
"ulc.onlyannounce": {"BoolFlag", "No"},
|
|
"light.nopruning": {"BoolFlag", "No"},
|
|
"light.nosyncserve": {"BoolFlag", "No"},
|
|
"dev.gaslimit": {"notABoolFlag", "No"},
|
|
"ethash.cachedir": {"notABoolFlag", "No"},
|
|
"ethash.cachesinmem": {"notABoolFlag", "No"},
|
|
"ethash.cachesondisk": {"notABoolFlag", "No"},
|
|
"ethash.cacheslockmmap": {"BoolFlag", "No"},
|
|
"ethash.dagdir": {"notABoolFlag", "No"},
|
|
"ethash.dagsinmem": {"notABoolFlag", "No"},
|
|
"ethash.dagsondisk": {"notABoolFlag", "No"},
|
|
"ethash.dagslockmmap": {"BoolFlag", "No"},
|
|
"fdlimit": {"notABoolFlag", "No"},
|
|
"signer": {"notABoolFlag", "No"},
|
|
"authrpc.jwtsecret": {"notABoolFlag", "No"},
|
|
"authrpc.addr": {"notABoolFlag", "No"},
|
|
"authrpc.port": {"notABoolFlag", "No"},
|
|
"authrpc.vhosts": {"notABoolFlag", "No"},
|
|
"graphql.corsdomain": {"notABoolFlag", "No"},
|
|
"graphql.vhosts": {"notABoolFlag", "No"},
|
|
"rpc.evmtimeout": {"notABoolFlag", "No"},
|
|
"rpc.allow-unprotected-txs": {"BoolFlag", "No"},
|
|
"jspath": {"notABoolFlag", "No"},
|
|
"exec": {"notABoolFlag", "No"},
|
|
"preload": {"notABoolFlag", "No"},
|
|
"discovery.dns": {"notABoolFlag", "No"},
|
|
"netrestrict": {"notABoolFlag", "No"},
|
|
"nodekey": {"notABoolFlag", "No"},
|
|
"nodekeyhex": {"notABoolFlag", "No"},
|
|
"miner.threads": {"notABoolFlag", "No"},
|
|
"miner.notify": {"notABoolFlag", "No"},
|
|
"miner.notify.full": {"BoolFlag", "No"},
|
|
"miner.recommit": {"notABoolFlag", "No"},
|
|
"miner.noverify": {"BoolFlag", "No"},
|
|
"vmdebug": {"BoolFlag", "No"},
|
|
"fakepow": {"BoolFlag", "No"},
|
|
"nocompaction": {"BoolFlag", "No"},
|
|
"metrics.addr": {"notABoolFlag", "No"},
|
|
"metrics.port": {"notABoolFlag", "No"},
|
|
"whitelist": {"notABoolFlag", "No"},
|
|
"snapshot": {"BoolFlag", "YesF"},
|
|
"bloomfilter.size": {"notABoolFlag", "No"},
|
|
"bor.logs": {"BoolFlag", "No"},
|
|
"override.arrowglacier": {"notABoolFlag", "No"},
|
|
"override.terminaltotaldifficulty": {"notABoolFlag", "No"},
|
|
"verbosity": {"notABoolFlag", "YesFV"},
|
|
"ws.origins": {"notABoolFlag", "No"},
|
|
}
|
|
|
|
// map from cli flags to corresponding toml tags
|
|
var nameTagMap = map[string]string{
|
|
"chain": "chain",
|
|
"identity": "identity",
|
|
"verbosity": "verbosity",
|
|
"datadir": "datadir",
|
|
"keystore": "keystore",
|
|
"syncmode": "syncmode",
|
|
"gcmode": "gcmode",
|
|
"eth.requiredblocks": "eth.requiredblocks",
|
|
"0-snapshot": "snapshot",
|
|
"\"bor.logs\"": "bor.logs",
|
|
"url": "bor.heimdall",
|
|
"\"bor.without\"": "bor.withoutheimdall",
|
|
"grpc-address": "bor.heimdallgRPC",
|
|
"\"bor.runheimdall\"": "bor.runheimdall",
|
|
"\"bor.runheimdallargs\"": "bor.runheimdallargs",
|
|
"locals": "txpool.locals",
|
|
"nolocals": "txpool.nolocals",
|
|
"journal": "txpool.journal",
|
|
"rejournal": "txpool.rejournal",
|
|
"pricelimit": "txpool.pricelimit",
|
|
"pricebump": "txpool.pricebump",
|
|
"accountslots": "txpool.accountslots",
|
|
"globalslots": "txpool.globalslots",
|
|
"accountqueue": "txpool.accountqueue",
|
|
"globalqueue": "txpool.globalqueue",
|
|
"lifetime": "txpool.lifetime",
|
|
"mine": "mine",
|
|
"etherbase": "miner.etherbase",
|
|
"extradata": "miner.extradata",
|
|
"gaslimit": "miner.gaslimit",
|
|
"gasprice": "miner.gasprice",
|
|
"ethstats": "ethstats",
|
|
"blocks": "gpo.blocks",
|
|
"percentile": "gpo.percentile",
|
|
"maxprice": "gpo.maxprice",
|
|
"ignoreprice": "gpo.ignoreprice",
|
|
"cache": "cache",
|
|
"1-database": "cache.database",
|
|
"trie": "cache.trie",
|
|
"trie.journal": "cache.journal",
|
|
"trie.rejournal": "cache.rejournal",
|
|
"gc": "cache.gc",
|
|
"1-snapshot": "cache.snapshot",
|
|
"noprefetch": "cache.noprefetch",
|
|
"preimages": "cache.preimages",
|
|
"txlookuplimit": "txlookuplimit",
|
|
"gascap": "rpc.gascap",
|
|
"txfeecap": "rpc.txfeecap",
|
|
"ipcdisable": "ipcdisable",
|
|
"ipcpath": "ipcpath",
|
|
"1-corsdomain": "http.corsdomain",
|
|
"1-vhosts": "http.vhosts",
|
|
"origins": "ws.origins",
|
|
"3-corsdomain": "graphql.corsdomain",
|
|
"3-vhosts": "graphql.vhosts",
|
|
"1-enabled": "http",
|
|
"1-host": "http.addr",
|
|
"1-port": "http.port",
|
|
"1-prefix": "http.rpcprefix",
|
|
"1-api": "http.api",
|
|
"2-enabled": "ws",
|
|
"2-host": "ws.addr",
|
|
"2-port": "ws.port",
|
|
"2-prefix": "ws.rpcprefix",
|
|
"2-api": "ws.api",
|
|
"3-enabled": "graphql",
|
|
"bind": "bind",
|
|
"0-port": "port",
|
|
"bootnodes": "bootnodes",
|
|
"maxpeers": "maxpeers",
|
|
"maxpendpeers": "maxpendpeers",
|
|
"nat": "nat",
|
|
"nodiscover": "nodiscover",
|
|
"v5disc": "v5disc",
|
|
"metrics": "metrics",
|
|
"expensive": "metrics.expensive",
|
|
"influxdb": "metrics.influxdb",
|
|
"endpoint": "metrics.influxdb.endpoint",
|
|
"0-database": "metrics.influxdb.database",
|
|
"username": "metrics.influxdb.username",
|
|
"0-password": "metrics.influxdb.password",
|
|
"tags": "metrics.influxdb.tags",
|
|
"prometheus-addr": "metrics.prometheus-addr",
|
|
"opencollector-endpoint": "metrics.opencollector-endpoint",
|
|
"influxdbv2": "metrics.influxdbv2",
|
|
"token": "metrics.influxdb.token",
|
|
"bucket": "metrics.influxdb.bucket",
|
|
"organization": "metrics.influxdb.organization",
|
|
"unlock": "unlock",
|
|
"1-password": "password",
|
|
"allow-insecure-unlock": "allow-insecure-unlock",
|
|
"lightkdf": "lightkdf",
|
|
"disable-bor-wallet": "disable-bor-wallet",
|
|
"addr": "grpc.addr",
|
|
"dev": "dev",
|
|
"period": "dev.period",
|
|
}
|
|
|
|
var removedFlagsAndValues = map[string]string{}
|
|
|
|
var replacedFlagsMapFlagAndValue = map[string]map[string]map[string]string{
|
|
"networkid": {
|
|
"flag": {
|
|
"networkid": "chain",
|
|
},
|
|
"value": {
|
|
"'137'": "mainnet",
|
|
"137": "mainnet",
|
|
"'80001'": "mumbai",
|
|
"80001": "mumbai",
|
|
},
|
|
},
|
|
"verbosity": {
|
|
"flag": {
|
|
"verbosity": "verbosity",
|
|
},
|
|
"value": {
|
|
"0": "CRIT",
|
|
"1": "ERROR",
|
|
"2": "WARN",
|
|
"3": "INFO",
|
|
"4": "DEBUG",
|
|
"5": "TRACE",
|
|
},
|
|
},
|
|
}
|
|
|
|
// Do not remove
|
|
var replacedFlagsMapFlag = map[string]string{}
|
|
|
|
var currentBoolFlags = []string{
|
|
"snapshot",
|
|
"bor.logs",
|
|
"bor.withoutheimdall",
|
|
"bor.runheimdall",
|
|
"txpool.nolocals",
|
|
"mine",
|
|
"cache.noprefetch",
|
|
"cache.preimages",
|
|
"ipcdisable",
|
|
"http",
|
|
"ws",
|
|
"graphql",
|
|
"nodiscover",
|
|
"v5disc",
|
|
"metrics",
|
|
"metrics.expensive",
|
|
"metrics.influxdb",
|
|
"metrics.influxdbv2",
|
|
"allow-insecure-unlock",
|
|
"lightkdf",
|
|
"disable-bor-wallet",
|
|
"dev",
|
|
}
|
|
|
|
func contains(s []string, str string) (bool, int) {
|
|
for ind, v := range s {
|
|
if v == str || v == "-"+str || v == "--"+str {
|
|
return true, ind
|
|
}
|
|
}
|
|
|
|
return false, -1
|
|
}
|
|
|
|
func indexOf(s []string, str string) int {
|
|
for k, v := range s {
|
|
if v == str || v == "-"+str || v == "--"+str {
|
|
return k
|
|
}
|
|
}
|
|
|
|
return -1
|
|
}
|
|
|
|
func remove1(s []string, idx int) []string {
|
|
removedFlagsAndValues[s[idx]] = ""
|
|
return append(s[:idx], s[idx+1:]...)
|
|
}
|
|
|
|
func remove2(s []string, idx int) []string {
|
|
removedFlagsAndValues[s[idx]] = s[idx+1]
|
|
return append(s[:idx], s[idx+2:]...)
|
|
}
|
|
|
|
func checkFlag(allFlags []string, checkFlags []string) []string {
|
|
outOfDateFlags := []string{}
|
|
|
|
for _, flag := range checkFlags {
|
|
t1, _ := contains(allFlags, flag)
|
|
if !t1 {
|
|
outOfDateFlags = append(outOfDateFlags, flag)
|
|
}
|
|
}
|
|
|
|
return outOfDateFlags
|
|
}
|
|
|
|
func checkFileExists(path string) bool {
|
|
_, err := os.Stat(path)
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
fmt.Println("WARN: File does not exist", path)
|
|
return false
|
|
} else {
|
|
return true
|
|
}
|
|
}
|
|
|
|
func writeTempStaticJSON(path string) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
var conf interface{}
|
|
if err := json.Unmarshal(data, &conf); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
temparr := []string{}
|
|
for _, item := range conf.([]interface{}) {
|
|
temparr = append(temparr, item.(string))
|
|
}
|
|
|
|
// write to a temp file
|
|
err = os.WriteFile("./tempStaticNodes.json", []byte(strings.Join(temparr, "\", \"")), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func writeTempStaticTrustedTOML(path string) {
|
|
data, err := toml.LoadFile(path)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
if data.Has("Node.P2P.StaticNodes") {
|
|
temparr := []string{}
|
|
for _, item := range data.Get("Node.P2P.StaticNodes").([]interface{}) {
|
|
temparr = append(temparr, item.(string))
|
|
}
|
|
|
|
err = os.WriteFile("./tempStaticNodes.toml", []byte(strings.Join(temparr, "\", \"")), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
|
|
if data.Has("Node.P2P.TrustedNodes") {
|
|
temparr := []string{}
|
|
for _, item := range data.Get("Node.P2P.TrustedNodes").([]interface{}) {
|
|
temparr = append(temparr, item.(string))
|
|
}
|
|
|
|
err = os.WriteFile("./tempTrustedNodes.toml", []byte(strings.Join(temparr, "\", \"")), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
|
|
if data.Has("Node.HTTPTimeouts.ReadTimeout") {
|
|
err = os.WriteFile("./tempHTTPTimeoutsReadTimeout.toml", []byte(data.Get("Node.HTTPTimeouts.ReadTimeout").(string)), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
|
|
if data.Has("Node.HTTPTimeouts.WriteTimeout") {
|
|
err = os.WriteFile("./tempHTTPTimeoutsWriteTimeout.toml", []byte(data.Get("Node.HTTPTimeouts.WriteTimeout").(string)), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
|
|
if data.Has("Node.HTTPTimeouts.IdleTimeout") {
|
|
err = os.WriteFile("./tempHTTPTimeoutsIdleTimeout.toml", []byte(data.Get("Node.HTTPTimeouts.IdleTimeout").(string)), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
|
|
if data.Has("Eth.TrieTimeout") {
|
|
err = os.WriteFile("./tempHTTPTimeoutsTrieTimeout.toml", []byte(data.Get("Eth.TrieTimeout").(string)), 0600)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func getStaticTrustedNodes(args []string) {
|
|
// if config flag is passed, it should be only a .toml file
|
|
t1, t2 := contains(args, "config")
|
|
// nolint: nestif
|
|
if t1 {
|
|
path := args[t2+1]
|
|
if !checkFileExists(path) {
|
|
return
|
|
}
|
|
|
|
if path[len(path)-4:] == "toml" {
|
|
writeTempStaticTrustedTOML(path)
|
|
} else {
|
|
fmt.Println("only TOML config file is supported through CLI")
|
|
}
|
|
} else {
|
|
path := "./static-nodes.json"
|
|
if !checkFileExists(path) {
|
|
return
|
|
}
|
|
writeTempStaticJSON(path)
|
|
}
|
|
}
|
|
|
|
func getFlagsToCheck(args []string) []string {
|
|
flagsToCheck := []string{}
|
|
|
|
for _, item := range args {
|
|
if strings.HasPrefix(item, "-") {
|
|
if item[1] == '-' {
|
|
temp := item[2:]
|
|
flagsToCheck = append(flagsToCheck, temp)
|
|
} else {
|
|
temp := item[1:]
|
|
flagsToCheck = append(flagsToCheck, temp)
|
|
}
|
|
}
|
|
}
|
|
|
|
return flagsToCheck
|
|
}
|
|
|
|
func getFlagType(flag string) string {
|
|
return flagMap[flag][0]
|
|
}
|
|
|
|
func updateArgsClean(args []string, outOfDateFlags []string) []string {
|
|
updatedArgs := []string{}
|
|
updatedArgs = append(updatedArgs, args...)
|
|
|
|
// iterate through outOfDateFlags and remove the flags from updatedArgs along with their value (if any)
|
|
for _, item := range outOfDateFlags {
|
|
idx := indexOf(updatedArgs, item)
|
|
|
|
if getFlagType(item) == "BoolFlag" {
|
|
// remove the element at index idx
|
|
updatedArgs = remove1(updatedArgs, idx)
|
|
} else {
|
|
// remove the element at index idx and idx + 1
|
|
updatedArgs = remove2(updatedArgs, idx)
|
|
}
|
|
}
|
|
|
|
return updatedArgs
|
|
}
|
|
|
|
func updateArgsAdd(args []string) []string {
|
|
for flag, value := range removedFlagsAndValues {
|
|
if strings.HasPrefix(flag, "--") {
|
|
flag = flag[2:]
|
|
} else {
|
|
flag = flag[1:]
|
|
}
|
|
|
|
if flagMap[flag][1] == "YesFV" {
|
|
temp := "--" + replacedFlagsMapFlagAndValue[flag]["flag"][flag] + " " + replacedFlagsMapFlagAndValue[flag]["value"][value]
|
|
args = append(args, temp)
|
|
} else if flagMap[flag][1] == "YesF" {
|
|
temp := "--" + replacedFlagsMapFlag[flag] + " " + value
|
|
args = append(args, temp)
|
|
}
|
|
}
|
|
|
|
return args
|
|
}
|
|
|
|
func handlePrometheus(args []string, updatedArgs []string) []string {
|
|
var newUpdatedArgs []string
|
|
|
|
mAddr := ""
|
|
mPort := ""
|
|
|
|
pAddr := ""
|
|
pPort := ""
|
|
|
|
newUpdatedArgs = append(newUpdatedArgs, updatedArgs...)
|
|
|
|
for i, val := range args {
|
|
if strings.Contains(val, "metrics.addr") && strings.HasPrefix(val, "-") {
|
|
mAddr = args[i+1]
|
|
}
|
|
|
|
if strings.Contains(val, "metrics.port") && strings.HasPrefix(val, "-") {
|
|
mPort = args[i+1]
|
|
}
|
|
|
|
if strings.Contains(val, "pprof.addr") && strings.HasPrefix(val, "-") {
|
|
pAddr = args[i+1]
|
|
}
|
|
|
|
if strings.Contains(val, "pprof.port") && strings.HasPrefix(val, "-") {
|
|
pPort = args[i+1]
|
|
}
|
|
}
|
|
|
|
if mAddr != "" && mPort != "" {
|
|
newUpdatedArgs = append(newUpdatedArgs, "--metrics.prometheus-addr")
|
|
newUpdatedArgs = append(newUpdatedArgs, mAddr+":"+mPort)
|
|
} else if pAddr != "" && pPort != "" {
|
|
newUpdatedArgs = append(newUpdatedArgs, "--metrics.prometheus-addr")
|
|
newUpdatedArgs = append(newUpdatedArgs, pAddr+":"+pPort)
|
|
}
|
|
|
|
return newUpdatedArgs
|
|
}
|
|
|
|
func dumpFlags(args []string) {
|
|
err := os.WriteFile("./temp", []byte(strings.Join(args, " ")), 0600)
|
|
if err != nil {
|
|
fmt.Println("Error in WriteFile")
|
|
} else {
|
|
fmt.Println("WriteFile Done")
|
|
}
|
|
}
|
|
|
|
// nolint: gocognit
|
|
func commentFlags(path string, updatedArgs []string) {
|
|
const cache = "[cache]"
|
|
|
|
const telemetry = "[telemetry]"
|
|
|
|
// snapshot: "[cache]"
|
|
cacheFlag := 0
|
|
|
|
// corsdomain, vhosts, enabled, host, api, port, prefix: "[p2p]", " [jsonrpc.http]", " [jsonrpc.ws]", " [jsonrpc.graphql]"
|
|
p2pHttpWsGraphFlag := -1
|
|
|
|
// database: "[telemetry]", "[cache]"
|
|
databaseFlag := -1
|
|
|
|
// password: "[telemetry]", "[accounts]"
|
|
passwordFlag := -1
|
|
|
|
ignoreLineFlag := false
|
|
|
|
canonicalPath, err := common.VerifyPath(path)
|
|
if err != nil {
|
|
fmt.Println("path not verified: " + err.Error())
|
|
return
|
|
}
|
|
|
|
input, err := os.ReadFile(canonicalPath)
|
|
if err != nil {
|
|
log.Fatalln(err)
|
|
}
|
|
|
|
lines := strings.Split(string(input), "\n")
|
|
|
|
var newLines []string
|
|
newLines = append(newLines, lines...)
|
|
|
|
for i, line := range lines {
|
|
if line == cache {
|
|
cacheFlag += 1
|
|
}
|
|
|
|
if line == "[p2p]" || line == " [jsonrpc.http]" || line == " [jsonrpc.ws]" || line == " [jsonrpc.graphql]" {
|
|
p2pHttpWsGraphFlag += 1
|
|
}
|
|
|
|
if line == telemetry || line == cache {
|
|
databaseFlag += 1
|
|
}
|
|
|
|
if line == telemetry || line == "[accounts]" {
|
|
passwordFlag += 1
|
|
}
|
|
|
|
if line == "[\"eth.requiredblocks\"]" || line == " [telemetry.influx.tags]" {
|
|
ignoreLineFlag = true
|
|
} else if line != "" {
|
|
if strings.HasPrefix(strings.Fields(line)[0], "[") {
|
|
ignoreLineFlag = false
|
|
}
|
|
}
|
|
|
|
// nolint: nestif
|
|
if !(strings.HasPrefix(line, "[") || strings.HasPrefix(line, " [") || strings.HasPrefix(line, " [") || line == "" || ignoreLineFlag) {
|
|
flag := strings.Fields(line)[0]
|
|
if flag == "snapshot" {
|
|
flag = strconv.Itoa(cacheFlag) + "-" + flag
|
|
} else if flag == "corsdomain" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "vhosts" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "enabled" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "host" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "api" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "port" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "prefix" {
|
|
flag = strconv.Itoa(p2pHttpWsGraphFlag) + "-" + flag
|
|
} else if flag == "database" {
|
|
flag = strconv.Itoa(databaseFlag) + "-" + flag
|
|
} else if flag == "password" {
|
|
flag = strconv.Itoa(passwordFlag) + "-" + flag
|
|
}
|
|
|
|
if flag != "static-nodes" && flag != "trusted-nodes" && flag != "read" && flag != "write" && flag != "idle" && flag != "timeout" {
|
|
flag = nameTagMap[flag]
|
|
|
|
tempFlag := false
|
|
|
|
for _, val := range updatedArgs {
|
|
if strings.Contains(val, flag) && (strings.Contains(val, "-") || strings.Contains(val, "--")) {
|
|
tempFlag = true
|
|
}
|
|
}
|
|
|
|
if !tempFlag || flag == "" {
|
|
newLines[i] = "# " + line
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
output := strings.Join(newLines, "\n")
|
|
|
|
err = os.WriteFile(canonicalPath, []byte(output), 0600)
|
|
if err != nil {
|
|
log.Fatalln(err)
|
|
}
|
|
}
|
|
|
|
func checkBoolFlags(val string) bool {
|
|
returnFlag := false
|
|
|
|
if strings.Contains(val, "=") {
|
|
val = strings.Split(val, "=")[0]
|
|
}
|
|
|
|
for _, flag := range currentBoolFlags {
|
|
if val == "-"+flag || val == "--"+flag {
|
|
returnFlag = true
|
|
}
|
|
}
|
|
|
|
return returnFlag
|
|
}
|
|
|
|
func beautifyArgs(args []string) ([]string, []string) {
|
|
newArgs := []string{}
|
|
|
|
ignoreForNow := []string{}
|
|
|
|
temp := []string{}
|
|
|
|
for _, val := range args {
|
|
// nolint: nestif
|
|
if !(checkBoolFlags(val)) {
|
|
if strings.HasPrefix(val, "-") {
|
|
if strings.Contains(val, "=") {
|
|
temparr := strings.Split(val, "=")
|
|
newArgs = append(newArgs, temparr...)
|
|
} else {
|
|
newArgs = append(newArgs, val)
|
|
}
|
|
} else {
|
|
newArgs = append(newArgs, val)
|
|
}
|
|
} else {
|
|
ignoreForNow = append(ignoreForNow, val)
|
|
}
|
|
}
|
|
|
|
for j, val := range newArgs {
|
|
if val == "-unlock" || val == "--unlock" {
|
|
temp = append(temp, "--miner.etherbase")
|
|
temp = append(temp, newArgs[j+1])
|
|
}
|
|
}
|
|
|
|
newArgs = append(newArgs, temp...)
|
|
|
|
return newArgs, ignoreForNow
|
|
}
|
|
|
|
func main() {
|
|
const notYet = "notYet"
|
|
|
|
temp := os.Args[1]
|
|
args := os.Args[2:]
|
|
|
|
args, ignoreForNow := beautifyArgs(args)
|
|
|
|
c := server.Command{}
|
|
flags := c.Flags()
|
|
allFlags := flags.GetAllFlags()
|
|
flagsToCheck := getFlagsToCheck(args)
|
|
|
|
if temp == notYet {
|
|
getStaticTrustedNodes(args)
|
|
}
|
|
|
|
outOfDateFlags := checkFlag(allFlags, flagsToCheck)
|
|
updatedArgs := updateArgsClean(args, outOfDateFlags)
|
|
updatedArgs = updateArgsAdd(updatedArgs)
|
|
updatedArgs = handlePrometheus(args, updatedArgs)
|
|
|
|
if temp == notYet {
|
|
updatedArgs = append(updatedArgs, ignoreForNow...)
|
|
dumpFlags(updatedArgs)
|
|
}
|
|
|
|
if temp != notYet {
|
|
updatedArgs = append(updatedArgs, ignoreForNow...)
|
|
commentFlags(temp, updatedArgs)
|
|
}
|
|
}
|