mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 23:26:44 +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>
1670 lines
51 KiB
Go
1670 lines
51 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package miner
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"math/big"
|
|
"os"
|
|
"runtime"
|
|
"runtime/pprof"
|
|
ptrace "runtime/trace"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
mapset "github.com/deckarep/golang-set"
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
"go.opentelemetry.io/otel/trace"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
cmath "github.com/ethereum/go-ethereum/common/math"
|
|
"github.com/ethereum/go-ethereum/common/tracing"
|
|
"github.com/ethereum/go-ethereum/consensus"
|
|
"github.com/ethereum/go-ethereum/consensus/bor"
|
|
"github.com/ethereum/go-ethereum/consensus/misc"
|
|
"github.com/ethereum/go-ethereum/core"
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/event"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/metrics"
|
|
"github.com/ethereum/go-ethereum/params"
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
)
|
|
|
|
const (
|
|
// resultQueueSize is the size of channel listening to sealing result.
|
|
resultQueueSize = 10
|
|
|
|
// txChanSize is the size of channel listening to NewTxsEvent.
|
|
// The number is referenced from the size of tx pool.
|
|
txChanSize = 4096
|
|
|
|
// chainHeadChanSize is the size of channel listening to ChainHeadEvent.
|
|
chainHeadChanSize = 10
|
|
|
|
// chainSideChanSize is the size of channel listening to ChainSideEvent.
|
|
chainSideChanSize = 10
|
|
|
|
// resubmitAdjustChanSize is the size of resubmitting interval adjustment channel.
|
|
resubmitAdjustChanSize = 10
|
|
|
|
// sealingLogAtDepth is the number of confirmations before logging successful sealing.
|
|
sealingLogAtDepth = 7
|
|
|
|
// minRecommitInterval is the minimal time interval to recreate the sealing block with
|
|
// any newly arrived transactions.
|
|
minRecommitInterval = 1 * time.Second
|
|
|
|
// maxRecommitInterval is the maximum time interval to recreate the sealing block with
|
|
// any newly arrived transactions.
|
|
maxRecommitInterval = 15 * time.Second
|
|
|
|
// intervalAdjustRatio is the impact a single interval adjustment has on sealing work
|
|
// resubmitting interval.
|
|
intervalAdjustRatio = 0.1
|
|
|
|
// intervalAdjustBias is applied during the new resubmit interval calculation in favor of
|
|
// increasing upper limit or decreasing lower limit so that the limit can be reachable.
|
|
intervalAdjustBias = 200 * 1000.0 * 1000.0
|
|
|
|
// staleThreshold is the maximum depth of the acceptable stale block.
|
|
staleThreshold = 7
|
|
)
|
|
|
|
// metrics gauge to track total and empty blocks sealed by a miner
|
|
var (
|
|
sealedBlocksCounter = metrics.NewRegisteredCounter("worker/sealedBlocks", nil)
|
|
sealedEmptyBlocksCounter = metrics.NewRegisteredCounter("worker/sealedEmptyBlocks", nil)
|
|
commitInterruptCounter = metrics.NewRegisteredCounter("worker/commitInterrupt", nil)
|
|
)
|
|
|
|
// environment is the worker's current environment and holds all
|
|
// information of the sealing block generation.
|
|
type environment struct {
|
|
signer types.Signer
|
|
|
|
state *state.StateDB // apply state changes here
|
|
ancestors mapset.Set // ancestor set (used for checking uncle parent validity)
|
|
family mapset.Set // family set (used for checking uncle invalidity)
|
|
tcount int // tx count in cycle
|
|
gasPool *core.GasPool // available gas used to pack transactions
|
|
coinbase common.Address
|
|
|
|
header *types.Header
|
|
txs []*types.Transaction
|
|
receipts []*types.Receipt
|
|
uncles map[common.Hash]*types.Header
|
|
}
|
|
|
|
// copy creates a deep copy of environment.
|
|
func (env *environment) copy() *environment {
|
|
cpy := &environment{
|
|
signer: env.signer,
|
|
state: env.state.Copy(),
|
|
ancestors: env.ancestors.Clone(),
|
|
family: env.family.Clone(),
|
|
tcount: env.tcount,
|
|
coinbase: env.coinbase,
|
|
header: types.CopyHeader(env.header),
|
|
receipts: copyReceipts(env.receipts),
|
|
}
|
|
if env.gasPool != nil {
|
|
gasPool := *env.gasPool
|
|
cpy.gasPool = &gasPool
|
|
}
|
|
// The content of txs and uncles are immutable, unnecessary
|
|
// to do the expensive deep copy for them.
|
|
cpy.txs = make([]*types.Transaction, len(env.txs))
|
|
copy(cpy.txs, env.txs)
|
|
cpy.uncles = make(map[common.Hash]*types.Header)
|
|
for hash, uncle := range env.uncles {
|
|
cpy.uncles[hash] = uncle
|
|
}
|
|
return cpy
|
|
}
|
|
|
|
// unclelist returns the contained uncles as the list format.
|
|
func (env *environment) unclelist() []*types.Header {
|
|
var uncles []*types.Header
|
|
for _, uncle := range env.uncles {
|
|
uncles = append(uncles, uncle)
|
|
}
|
|
return uncles
|
|
}
|
|
|
|
// discard terminates the background prefetcher go-routine. It should
|
|
// always be called for all created environment instances otherwise
|
|
// the go-routine leak can happen.
|
|
func (env *environment) discard() {
|
|
if env.state == nil {
|
|
return
|
|
}
|
|
env.state.StopPrefetcher()
|
|
}
|
|
|
|
// task contains all information for consensus engine sealing and result submitting.
|
|
type task struct {
|
|
//nolint:containedctx
|
|
ctx context.Context
|
|
receipts []*types.Receipt
|
|
state *state.StateDB
|
|
block *types.Block
|
|
createdAt time.Time
|
|
}
|
|
|
|
const (
|
|
commitInterruptNone int32 = iota
|
|
commitInterruptNewHead
|
|
commitInterruptResubmit
|
|
)
|
|
|
|
// newWorkReq represents a request for new sealing work submitting with relative interrupt notifier.
|
|
type newWorkReq struct {
|
|
//nolint:containedctx
|
|
ctx context.Context
|
|
interrupt *int32
|
|
noempty bool
|
|
timestamp int64
|
|
}
|
|
|
|
// getWorkReq represents a request for getting a new sealing work with provided parameters.
|
|
type getWorkReq struct {
|
|
//nolint:containedctx
|
|
ctx context.Context
|
|
params *generateParams
|
|
err error
|
|
result chan *types.Block
|
|
}
|
|
|
|
// intervalAdjust represents a resubmitting interval adjustment.
|
|
type intervalAdjust struct {
|
|
ratio float64
|
|
inc bool
|
|
}
|
|
|
|
// worker is the main object which takes care of submitting new work to consensus engine
|
|
// and gathering the sealing result.
|
|
type worker struct {
|
|
config *Config
|
|
chainConfig *params.ChainConfig
|
|
engine consensus.Engine
|
|
eth Backend
|
|
chain *core.BlockChain
|
|
merger *consensus.Merger
|
|
|
|
// Feeds
|
|
pendingLogsFeed event.Feed
|
|
|
|
// Subscriptions
|
|
mux *event.TypeMux
|
|
txsCh chan core.NewTxsEvent
|
|
txsSub event.Subscription
|
|
chainHeadCh chan core.ChainHeadEvent
|
|
chainHeadSub event.Subscription
|
|
chainSideCh chan core.ChainSideEvent
|
|
chainSideSub event.Subscription
|
|
|
|
// Channels
|
|
newWorkCh chan *newWorkReq
|
|
getWorkCh chan *getWorkReq
|
|
taskCh chan *task
|
|
resultCh chan *types.Block
|
|
startCh chan struct{}
|
|
exitCh chan struct{}
|
|
resubmitIntervalCh chan time.Duration
|
|
resubmitAdjustCh chan *intervalAdjust
|
|
|
|
wg sync.WaitGroup
|
|
|
|
current *environment // An environment for current running cycle.
|
|
localUncles map[common.Hash]*types.Block // A set of side blocks generated locally as the possible uncle blocks.
|
|
remoteUncles map[common.Hash]*types.Block // A set of side blocks as the possible uncle blocks.
|
|
unconfirmed *unconfirmedBlocks // A set of locally mined blocks pending canonicalness confirmations.
|
|
|
|
mu sync.RWMutex // The lock used to protect the coinbase and extra fields
|
|
coinbase common.Address
|
|
extra []byte
|
|
|
|
pendingMu sync.RWMutex
|
|
pendingTasks map[common.Hash]*task
|
|
|
|
snapshotMu sync.RWMutex // The lock used to protect the snapshots below
|
|
snapshotBlock *types.Block
|
|
snapshotReceipts types.Receipts
|
|
snapshotState *state.StateDB
|
|
|
|
// atomic status counters
|
|
running int32 // The indicator whether the consensus engine is running or not.
|
|
newTxs int32 // New arrival transaction count since last sealing work submitting.
|
|
|
|
// noempty is the flag used to control whether the feature of pre-seal empty
|
|
// block is enabled. The default value is false(pre-seal is enabled by default).
|
|
// But in some special scenario the consensus engine will seal blocks instantaneously,
|
|
// in this case this feature will add all empty blocks into canonical chain
|
|
// non-stop and no real transaction will be included.
|
|
noempty uint32
|
|
|
|
// External functions
|
|
isLocalBlock func(header *types.Header) bool // Function used to determine whether the specified block is mined by local miner.
|
|
|
|
// Test hooks
|
|
newTaskHook func(*task) // Method to call upon receiving a new sealing task.
|
|
skipSealHook func(*task) bool // Method to decide whether skipping the sealing.
|
|
fullTaskHook func() // Method to call before pushing the full sealing task.
|
|
resubmitHook func(time.Duration, time.Duration) // Method to call upon updating resubmitting interval.
|
|
|
|
profileCount *int32 // Global count for profiling
|
|
}
|
|
|
|
//nolint:staticcheck
|
|
func newWorker(config *Config, chainConfig *params.ChainConfig, engine consensus.Engine, eth Backend, mux *event.TypeMux, isLocalBlock func(header *types.Header) bool, init bool) *worker {
|
|
worker := &worker{
|
|
config: config,
|
|
chainConfig: chainConfig,
|
|
engine: engine,
|
|
eth: eth,
|
|
mux: mux,
|
|
chain: eth.BlockChain(),
|
|
isLocalBlock: isLocalBlock,
|
|
localUncles: make(map[common.Hash]*types.Block),
|
|
remoteUncles: make(map[common.Hash]*types.Block),
|
|
unconfirmed: newUnconfirmedBlocks(eth.BlockChain(), sealingLogAtDepth),
|
|
pendingTasks: make(map[common.Hash]*task),
|
|
txsCh: make(chan core.NewTxsEvent, txChanSize),
|
|
chainHeadCh: make(chan core.ChainHeadEvent, chainHeadChanSize),
|
|
chainSideCh: make(chan core.ChainSideEvent, chainSideChanSize),
|
|
newWorkCh: make(chan *newWorkReq),
|
|
getWorkCh: make(chan *getWorkReq),
|
|
taskCh: make(chan *task),
|
|
resultCh: make(chan *types.Block, resultQueueSize),
|
|
exitCh: make(chan struct{}),
|
|
startCh: make(chan struct{}, 1),
|
|
resubmitIntervalCh: make(chan time.Duration),
|
|
resubmitAdjustCh: make(chan *intervalAdjust, resubmitAdjustChanSize),
|
|
noempty: 1,
|
|
}
|
|
worker.profileCount = new(int32)
|
|
// Subscribe NewTxsEvent for tx pool
|
|
worker.txsSub = eth.TxPool().SubscribeNewTxsEvent(worker.txsCh)
|
|
// Subscribe events for blockchain
|
|
worker.chainHeadSub = eth.BlockChain().SubscribeChainHeadEvent(worker.chainHeadCh)
|
|
worker.chainSideSub = eth.BlockChain().SubscribeChainSideEvent(worker.chainSideCh)
|
|
|
|
// Sanitize recommit interval if the user-specified one is too short.
|
|
recommit := worker.config.Recommit
|
|
if recommit < minRecommitInterval {
|
|
log.Warn("Sanitizing miner recommit interval", "provided", recommit, "updated", minRecommitInterval)
|
|
recommit = minRecommitInterval
|
|
}
|
|
|
|
ctx := tracing.WithTracer(context.Background(), otel.GetTracerProvider().Tracer("MinerWorker"))
|
|
|
|
worker.wg.Add(4)
|
|
|
|
go worker.mainLoop(ctx)
|
|
go worker.newWorkLoop(ctx, recommit)
|
|
go worker.resultLoop()
|
|
go worker.taskLoop()
|
|
|
|
// Submit first work to initialize pending state.
|
|
if init {
|
|
worker.startCh <- struct{}{}
|
|
}
|
|
return worker
|
|
}
|
|
|
|
// setEtherbase sets the etherbase used to initialize the block coinbase field.
|
|
func (w *worker) setEtherbase(addr common.Address) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.coinbase = addr
|
|
}
|
|
|
|
func (w *worker) setGasCeil(ceil uint64) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.config.GasCeil = ceil
|
|
}
|
|
|
|
// setExtra sets the content used to initialize the block extra field.
|
|
func (w *worker) setExtra(extra []byte) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.extra = extra
|
|
}
|
|
|
|
// setRecommitInterval updates the interval for miner sealing work recommitting.
|
|
func (w *worker) setRecommitInterval(interval time.Duration) {
|
|
select {
|
|
case w.resubmitIntervalCh <- interval:
|
|
case <-w.exitCh:
|
|
}
|
|
}
|
|
|
|
// disablePreseal disables pre-sealing feature
|
|
func (w *worker) disablePreseal() {
|
|
atomic.StoreUint32(&w.noempty, 1)
|
|
}
|
|
|
|
// enablePreseal enables pre-sealing feature
|
|
func (w *worker) enablePreseal() {
|
|
atomic.StoreUint32(&w.noempty, 0)
|
|
}
|
|
|
|
// pending returns the pending state and corresponding block.
|
|
func (w *worker) pending() (*types.Block, *state.StateDB) {
|
|
// return a snapshot to avoid contention on currentMu mutex
|
|
w.snapshotMu.RLock()
|
|
defer w.snapshotMu.RUnlock()
|
|
if w.snapshotState == nil {
|
|
return nil, nil
|
|
}
|
|
return w.snapshotBlock, w.snapshotState.Copy()
|
|
}
|
|
|
|
// pendingBlock returns pending block.
|
|
func (w *worker) pendingBlock() *types.Block {
|
|
// return a snapshot to avoid contention on currentMu mutex
|
|
w.snapshotMu.RLock()
|
|
defer w.snapshotMu.RUnlock()
|
|
return w.snapshotBlock
|
|
}
|
|
|
|
// pendingBlockAndReceipts returns pending block and corresponding receipts.
|
|
func (w *worker) pendingBlockAndReceipts() (*types.Block, types.Receipts) {
|
|
// return a snapshot to avoid contention on currentMu mutex
|
|
w.snapshotMu.RLock()
|
|
defer w.snapshotMu.RUnlock()
|
|
return w.snapshotBlock, w.snapshotReceipts
|
|
}
|
|
|
|
// start sets the running status as 1 and triggers new work submitting.
|
|
func (w *worker) start() {
|
|
atomic.StoreInt32(&w.running, 1)
|
|
w.startCh <- struct{}{}
|
|
}
|
|
|
|
// stop sets the running status as 0.
|
|
func (w *worker) stop() {
|
|
atomic.StoreInt32(&w.running, 0)
|
|
}
|
|
|
|
// isRunning returns an indicator whether worker is running or not.
|
|
func (w *worker) isRunning() bool {
|
|
return atomic.LoadInt32(&w.running) == 1
|
|
}
|
|
|
|
// close terminates all background threads maintained by the worker.
|
|
// Note the worker does not support being closed multiple times.
|
|
func (w *worker) close() {
|
|
atomic.StoreInt32(&w.running, 0)
|
|
close(w.exitCh)
|
|
w.wg.Wait()
|
|
}
|
|
|
|
// recalcRecommit recalculates the resubmitting interval upon feedback.
|
|
func recalcRecommit(minRecommit, prev time.Duration, target float64, inc bool) time.Duration {
|
|
// var (
|
|
// prevF = float64(prev.Nanoseconds())
|
|
// next float64
|
|
// )
|
|
//
|
|
// if inc {
|
|
// next = prevF*(1-intervalAdjustRatio) + intervalAdjustRatio*(target+intervalAdjustBias)
|
|
// max := float64(maxRecommitInterval.Nanoseconds())
|
|
//
|
|
// if next > max {
|
|
// next = max
|
|
// }
|
|
// } else {
|
|
// next = prevF*(1-intervalAdjustRatio) + intervalAdjustRatio*(target-intervalAdjustBias)
|
|
// min := float64(minRecommit.Nanoseconds())
|
|
//
|
|
// if next < min {
|
|
// next = min
|
|
// }
|
|
// }
|
|
//
|
|
// log.Info("Recalc Commit", "Prev", prev, "Next", next)
|
|
|
|
//returning the Same prev value to keep the recommit interval constant
|
|
return prev
|
|
}
|
|
|
|
// newWorkLoop is a standalone goroutine to submit new sealing work upon received events.
|
|
//
|
|
//nolint:gocognit
|
|
func (w *worker) newWorkLoop(ctx context.Context, recommit time.Duration) {
|
|
defer w.wg.Done()
|
|
var (
|
|
interrupt *int32
|
|
minRecommit = recommit // minimal resubmit interval specified by user.
|
|
timestamp int64 // timestamp for each round of sealing.
|
|
)
|
|
|
|
timer := time.NewTimer(0)
|
|
defer timer.Stop()
|
|
<-timer.C // discard the initial tick
|
|
|
|
// commit aborts in-flight transaction execution with given signal and resubmits a new one.
|
|
commit := func(noempty bool, s int32) {
|
|
// we close spans only by the place we created them
|
|
ctx, span := tracing.Trace(ctx, "worker.newWorkLoop.commit")
|
|
tracing.EndSpan(span)
|
|
|
|
if interrupt != nil {
|
|
atomic.StoreInt32(interrupt, s)
|
|
}
|
|
interrupt = new(int32)
|
|
select {
|
|
case w.newWorkCh <- &newWorkReq{interrupt: interrupt, noempty: noempty, timestamp: timestamp, ctx: ctx}:
|
|
case <-w.exitCh:
|
|
return
|
|
}
|
|
timer.Reset(recommit)
|
|
atomic.StoreInt32(&w.newTxs, 0)
|
|
}
|
|
// clearPending cleans the stale pending tasks.
|
|
clearPending := func(number uint64) {
|
|
_, span := tracing.Trace(ctx, "worker.newWorkLoop.clearPending")
|
|
tracing.EndSpan(span)
|
|
|
|
w.pendingMu.Lock()
|
|
for h, t := range w.pendingTasks {
|
|
if t.block.NumberU64()+staleThreshold <= number {
|
|
delete(w.pendingTasks, h)
|
|
}
|
|
}
|
|
w.pendingMu.Unlock()
|
|
}
|
|
|
|
for {
|
|
select {
|
|
case <-w.startCh:
|
|
clearPending(w.chain.CurrentBlock().NumberU64())
|
|
timestamp = time.Now().Unix()
|
|
commit(false, commitInterruptNewHead)
|
|
|
|
case head := <-w.chainHeadCh:
|
|
clearPending(head.Block.NumberU64())
|
|
timestamp = time.Now().Unix()
|
|
commit(false, commitInterruptNewHead)
|
|
|
|
case <-timer.C:
|
|
// If sealing is running resubmit a new work cycle periodically to pull in
|
|
// higher priced transactions. Disable this overhead for pending blocks.
|
|
if w.isRunning() && (w.chainConfig.Clique == nil || w.chainConfig.Clique.Period > 0) {
|
|
// Short circuit if no new transaction arrives.
|
|
if atomic.LoadInt32(&w.newTxs) == 0 {
|
|
timer.Reset(recommit)
|
|
continue
|
|
}
|
|
commit(true, commitInterruptResubmit)
|
|
}
|
|
|
|
case interval := <-w.resubmitIntervalCh:
|
|
// Adjust resubmit interval explicitly by user.
|
|
if interval < minRecommitInterval {
|
|
log.Warn("Sanitizing miner recommit interval", "provided", interval, "updated", minRecommitInterval)
|
|
interval = minRecommitInterval
|
|
}
|
|
log.Info("Miner recommit interval update", "from", minRecommit, "to", interval)
|
|
minRecommit, recommit = interval, interval
|
|
|
|
if w.resubmitHook != nil {
|
|
w.resubmitHook(minRecommit, recommit)
|
|
}
|
|
|
|
case adjust := <-w.resubmitAdjustCh:
|
|
// Adjust resubmit interval by feedback.
|
|
if adjust.inc {
|
|
before := recommit
|
|
target := float64(recommit.Nanoseconds()) / adjust.ratio
|
|
recommit = recalcRecommit(minRecommit, recommit, target, true)
|
|
log.Trace("Increase miner recommit interval", "from", before, "to", recommit)
|
|
} else {
|
|
before := recommit
|
|
recommit = recalcRecommit(minRecommit, recommit, float64(minRecommit.Nanoseconds()), false)
|
|
log.Trace("Decrease miner recommit interval", "from", before, "to", recommit)
|
|
}
|
|
|
|
if w.resubmitHook != nil {
|
|
w.resubmitHook(minRecommit, recommit)
|
|
}
|
|
|
|
case <-w.exitCh:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// mainLoop is responsible for generating and submitting sealing work based on
|
|
// the received event. It can support two modes: automatically generate task and
|
|
// submit it or return task according to given parameters for various proposes.
|
|
// nolint: gocognit
|
|
func (w *worker) mainLoop(ctx context.Context) {
|
|
defer w.wg.Done()
|
|
defer w.txsSub.Unsubscribe()
|
|
defer w.chainHeadSub.Unsubscribe()
|
|
defer w.chainSideSub.Unsubscribe()
|
|
defer func() {
|
|
if w.current != nil {
|
|
w.current.discard()
|
|
}
|
|
}()
|
|
|
|
cleanTicker := time.NewTicker(time.Second * 10)
|
|
defer cleanTicker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case req := <-w.newWorkCh:
|
|
//nolint:contextcheck
|
|
w.commitWork(req.ctx, req.interrupt, req.noempty, req.timestamp)
|
|
|
|
case req := <-w.getWorkCh:
|
|
//nolint:contextcheck
|
|
block, err := w.generateWork(req.ctx, req.params)
|
|
if err != nil {
|
|
req.err = err
|
|
req.result <- nil
|
|
} else {
|
|
req.result <- block
|
|
}
|
|
|
|
case ev := <-w.chainSideCh:
|
|
// Short circuit for duplicate side blocks
|
|
if _, exist := w.localUncles[ev.Block.Hash()]; exist {
|
|
continue
|
|
}
|
|
if _, exist := w.remoteUncles[ev.Block.Hash()]; exist {
|
|
continue
|
|
}
|
|
// Add side block to possible uncle block set depending on the author.
|
|
if w.isLocalBlock != nil && w.isLocalBlock(ev.Block.Header()) {
|
|
w.localUncles[ev.Block.Hash()] = ev.Block
|
|
} else {
|
|
w.remoteUncles[ev.Block.Hash()] = ev.Block
|
|
}
|
|
// If our sealing block contains less than 2 uncle blocks,
|
|
// add the new uncle block if valid and regenerate a new
|
|
// sealing block for higher profit.
|
|
if w.isRunning() && w.current != nil && len(w.current.uncles) < 2 {
|
|
start := time.Now()
|
|
if err := w.commitUncle(w.current, ev.Block.Header()); err == nil {
|
|
commitErr := w.commit(ctx, w.current.copy(), nil, true, start)
|
|
if commitErr != nil {
|
|
log.Error("error while committing work for mining", "err", commitErr)
|
|
}
|
|
}
|
|
}
|
|
|
|
case <-cleanTicker.C:
|
|
chainHead := w.chain.CurrentBlock()
|
|
for hash, uncle := range w.localUncles {
|
|
if uncle.NumberU64()+staleThreshold <= chainHead.NumberU64() {
|
|
delete(w.localUncles, hash)
|
|
}
|
|
}
|
|
for hash, uncle := range w.remoteUncles {
|
|
if uncle.NumberU64()+staleThreshold <= chainHead.NumberU64() {
|
|
delete(w.remoteUncles, hash)
|
|
}
|
|
}
|
|
|
|
case ev := <-w.txsCh:
|
|
// Apply transactions to the pending state if we're not sealing
|
|
//
|
|
// Note all transactions received may not be continuous with transactions
|
|
// already included in the current sealing block. These transactions will
|
|
// be automatically eliminated.
|
|
if !w.isRunning() && w.current != nil {
|
|
// If block is already full, abort
|
|
if gp := w.current.gasPool; gp != nil && gp.Gas() < params.TxGas {
|
|
continue
|
|
}
|
|
|
|
txs := make(map[common.Address]types.Transactions)
|
|
|
|
for _, tx := range ev.Txs {
|
|
acc, _ := types.Sender(w.current.signer, tx)
|
|
txs[acc] = append(txs[acc], tx)
|
|
}
|
|
|
|
txset := types.NewTransactionsByPriceAndNonce(w.current.signer, txs, cmath.FromBig(w.current.header.BaseFee))
|
|
tcount := w.current.tcount
|
|
|
|
//nolint:contextcheck
|
|
w.commitTransactions(w.current, txset, nil, context.Background())
|
|
|
|
// Only update the snapshot if any new transactions were added
|
|
// to the pending block
|
|
if tcount != w.current.tcount {
|
|
w.updateSnapshot(w.current)
|
|
}
|
|
} else {
|
|
// Special case, if the consensus engine is 0 period clique(dev mode),
|
|
// submit sealing work here since all empty submission will be rejected
|
|
// by clique. Of course the advance sealing(empty submission) is disabled.
|
|
if w.chainConfig.Clique != nil && w.chainConfig.Clique.Period == 0 {
|
|
w.commitWork(ctx, nil, true, time.Now().Unix())
|
|
}
|
|
}
|
|
atomic.AddInt32(&w.newTxs, int32(len(ev.Txs)))
|
|
|
|
// System stopped
|
|
case <-w.exitCh:
|
|
return
|
|
case <-w.txsSub.Err():
|
|
return
|
|
case <-w.chainHeadSub.Err():
|
|
return
|
|
case <-w.chainSideSub.Err():
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// taskLoop is a standalone goroutine to fetch sealing task from the generator and
|
|
// push them to consensus engine.
|
|
func (w *worker) taskLoop() {
|
|
defer w.wg.Done()
|
|
var (
|
|
stopCh chan struct{}
|
|
prev common.Hash
|
|
)
|
|
|
|
// interrupt aborts the in-flight sealing task.
|
|
interrupt := func() {
|
|
if stopCh != nil {
|
|
close(stopCh)
|
|
stopCh = nil
|
|
}
|
|
}
|
|
for {
|
|
select {
|
|
case task := <-w.taskCh:
|
|
if w.newTaskHook != nil {
|
|
w.newTaskHook(task)
|
|
}
|
|
// Reject duplicate sealing work due to resubmitting.
|
|
sealHash := w.engine.SealHash(task.block.Header())
|
|
if sealHash == prev {
|
|
continue
|
|
}
|
|
// Interrupt previous sealing operation
|
|
interrupt()
|
|
stopCh, prev = make(chan struct{}), sealHash
|
|
|
|
if w.skipSealHook != nil && w.skipSealHook(task) {
|
|
continue
|
|
}
|
|
w.pendingMu.Lock()
|
|
w.pendingTasks[sealHash] = task
|
|
w.pendingMu.Unlock()
|
|
|
|
if err := w.engine.Seal(task.ctx, w.chain, task.block, w.resultCh, stopCh); err != nil {
|
|
log.Warn("Block sealing failed", "err", err)
|
|
w.pendingMu.Lock()
|
|
delete(w.pendingTasks, sealHash)
|
|
w.pendingMu.Unlock()
|
|
}
|
|
case <-w.exitCh:
|
|
interrupt()
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// resultLoop is a standalone goroutine to handle sealing result submitting
|
|
// and flush relative data to the database.
|
|
func (w *worker) resultLoop() {
|
|
defer w.wg.Done()
|
|
for {
|
|
select {
|
|
case block := <-w.resultCh:
|
|
// Short circuit when receiving empty result.
|
|
if block == nil {
|
|
continue
|
|
}
|
|
|
|
// Short circuit when receiving duplicate result caused by resubmitting.
|
|
if w.chain.HasBlock(block.Hash(), block.NumberU64()) {
|
|
continue
|
|
}
|
|
|
|
oldBlock := w.chain.GetBlockByNumber(block.NumberU64())
|
|
if oldBlock != nil {
|
|
oldBlockAuthor, _ := w.chain.Engine().Author(oldBlock.Header())
|
|
newBlockAuthor, _ := w.chain.Engine().Author(block.Header())
|
|
if oldBlockAuthor == newBlockAuthor {
|
|
log.Info("same block ", "height", block.NumberU64())
|
|
continue
|
|
}
|
|
}
|
|
|
|
var (
|
|
sealhash = w.engine.SealHash(block.Header())
|
|
hash = block.Hash()
|
|
)
|
|
|
|
w.pendingMu.RLock()
|
|
task, exist := w.pendingTasks[sealhash]
|
|
w.pendingMu.RUnlock()
|
|
|
|
if !exist {
|
|
log.Error("Block found but no relative pending task", "number", block.Number(), "sealhash", sealhash, "hash", hash)
|
|
continue
|
|
}
|
|
|
|
// Different block could share same sealhash, deep copy here to prevent write-write conflict.
|
|
var (
|
|
receipts = make([]*types.Receipt, len(task.receipts))
|
|
logs []*types.Log
|
|
err error
|
|
)
|
|
|
|
tracing.Exec(task.ctx, "", "resultLoop", func(ctx context.Context, span trace.Span) {
|
|
for i, taskReceipt := range task.receipts {
|
|
receipt := new(types.Receipt)
|
|
receipts[i] = receipt
|
|
*receipt = *taskReceipt
|
|
|
|
// add block location fields
|
|
receipt.BlockHash = hash
|
|
receipt.BlockNumber = block.Number()
|
|
receipt.TransactionIndex = uint(i)
|
|
|
|
// Update the block hash in all logs since it is now available and not when the
|
|
// receipt/log of individual transactions were created.
|
|
receipt.Logs = make([]*types.Log, len(taskReceipt.Logs))
|
|
for i, taskLog := range taskReceipt.Logs {
|
|
log := new(types.Log)
|
|
receipt.Logs[i] = log
|
|
*log = *taskLog
|
|
log.BlockHash = hash
|
|
}
|
|
logs = append(logs, receipt.Logs...)
|
|
}
|
|
|
|
// Commit block and state to database.
|
|
tracing.Exec(ctx, "", "resultLoop.WriteBlockAndSetHead", func(ctx context.Context, span trace.Span) {
|
|
_, err = w.chain.WriteBlockAndSetHead(ctx, block, receipts, logs, task.state, true)
|
|
})
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.String("hash", hash.String()),
|
|
attribute.Int("number", int(block.Number().Uint64())),
|
|
attribute.Int("txns", block.Transactions().Len()),
|
|
attribute.Int("gas used", int(block.GasUsed())),
|
|
attribute.Int("elapsed", int(time.Since(task.createdAt).Milliseconds())),
|
|
attribute.Bool("error", err != nil),
|
|
)
|
|
})
|
|
|
|
if err != nil {
|
|
log.Error("Failed writing block to chain", "err", err)
|
|
continue
|
|
}
|
|
|
|
log.Info("Successfully sealed new block", "number", block.Number(), "sealhash", sealhash, "hash", hash,
|
|
"elapsed", common.PrettyDuration(time.Since(task.createdAt)))
|
|
|
|
// Broadcast the block and announce chain insertion event
|
|
w.mux.Post(core.NewMinedBlockEvent{Block: block})
|
|
|
|
sealedBlocksCounter.Inc(1)
|
|
|
|
if block.Transactions().Len() == 0 {
|
|
sealedEmptyBlocksCounter.Inc(1)
|
|
}
|
|
|
|
// Insert the block into the set of pending ones to resultLoop for confirmations
|
|
w.unconfirmed.Insert(block.NumberU64(), block.Hash())
|
|
case <-w.exitCh:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// makeEnv creates a new environment for the sealing block.
|
|
func (w *worker) makeEnv(parent *types.Block, header *types.Header, coinbase common.Address) (*environment, error) {
|
|
// Retrieve the parent state to execute on top and start a prefetcher for
|
|
// the miner to speed block sealing up a bit.
|
|
state, err := w.chain.StateAt(parent.Root())
|
|
if err != nil {
|
|
// Note since the sealing block can be created upon the arbitrary parent
|
|
// block, but the state of parent block may already be pruned, so the necessary
|
|
// state recovery is needed here in the future.
|
|
//
|
|
// The maximum acceptable reorg depth can be limited by the finalised block
|
|
// somehow. TODO(rjl493456442) fix the hard-coded number here later.
|
|
state, err = w.eth.StateAtBlock(parent, 1024, nil, false, false)
|
|
log.Warn("Recovered mining state", "root", parent.Root(), "err", err)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
state.StartPrefetcher("miner")
|
|
|
|
// Note the passed coinbase may be different with header.Coinbase.
|
|
env := &environment{
|
|
signer: types.MakeSigner(w.chainConfig, header.Number),
|
|
state: state,
|
|
coinbase: coinbase,
|
|
ancestors: mapset.NewSet(),
|
|
family: mapset.NewSet(),
|
|
header: header,
|
|
uncles: make(map[common.Hash]*types.Header),
|
|
}
|
|
// when 08 is processed ancestors contain 07 (quick block)
|
|
for _, ancestor := range w.chain.GetBlocksFromHash(parent.Hash(), 7) {
|
|
for _, uncle := range ancestor.Uncles() {
|
|
env.family.Add(uncle.Hash())
|
|
}
|
|
env.family.Add(ancestor.Hash())
|
|
env.ancestors.Add(ancestor.Hash())
|
|
}
|
|
// Keep track of transactions which return errors so they can be removed
|
|
env.tcount = 0
|
|
return env, nil
|
|
}
|
|
|
|
// commitUncle adds the given block to uncle block set, returns error if failed to add.
|
|
func (w *worker) commitUncle(env *environment, uncle *types.Header) error {
|
|
if w.isTTDReached(env.header) {
|
|
return errors.New("ignore uncle for beacon block")
|
|
}
|
|
hash := uncle.Hash()
|
|
if _, exist := env.uncles[hash]; exist {
|
|
return errors.New("uncle not unique")
|
|
}
|
|
if env.header.ParentHash == uncle.ParentHash {
|
|
return errors.New("uncle is sibling")
|
|
}
|
|
if !env.ancestors.Contains(uncle.ParentHash) {
|
|
return errors.New("uncle's parent unknown")
|
|
}
|
|
if env.family.Contains(hash) {
|
|
return errors.New("uncle already included")
|
|
}
|
|
env.uncles[hash] = uncle
|
|
return nil
|
|
}
|
|
|
|
// updateSnapshot updates pending snapshot block, receipts and state.
|
|
func (w *worker) updateSnapshot(env *environment) {
|
|
w.snapshotMu.Lock()
|
|
defer w.snapshotMu.Unlock()
|
|
|
|
w.snapshotBlock = types.NewBlock(
|
|
env.header,
|
|
env.txs,
|
|
env.unclelist(),
|
|
env.receipts,
|
|
trie.NewStackTrie(nil),
|
|
)
|
|
w.snapshotReceipts = copyReceipts(env.receipts)
|
|
w.snapshotState = env.state.Copy()
|
|
}
|
|
|
|
func (w *worker) commitTransaction(env *environment, tx *types.Transaction) ([]*types.Log, error) {
|
|
snap := env.state.Snapshot()
|
|
|
|
receipt, err := core.ApplyTransaction(w.chainConfig, w.chain, &env.coinbase, env.gasPool, env.state, env.header, tx, &env.header.GasUsed, *w.chain.GetVMConfig())
|
|
if err != nil {
|
|
env.state.RevertToSnapshot(snap)
|
|
return nil, err
|
|
}
|
|
env.txs = append(env.txs, tx)
|
|
env.receipts = append(env.receipts, receipt)
|
|
|
|
return receipt.Logs, nil
|
|
}
|
|
|
|
//nolint:gocognit
|
|
func (w *worker) commitTransactions(env *environment, txs *types.TransactionsByPriceAndNonce, interrupt *int32, interruptCtx context.Context) bool {
|
|
gasLimit := env.header.GasLimit
|
|
if env.gasPool == nil {
|
|
env.gasPool = new(core.GasPool).AddGas(gasLimit)
|
|
}
|
|
var coalescedLogs []*types.Log
|
|
|
|
initialGasLimit := env.gasPool.Gas()
|
|
initialTxs := txs.GetTxs()
|
|
|
|
var breakCause string
|
|
|
|
defer func() {
|
|
log.OnDebug(func(lg log.Logging) {
|
|
lg("commitTransactions-stats",
|
|
"initialTxsCount", initialTxs,
|
|
"initialGasLimit", initialGasLimit,
|
|
"resultTxsCount", txs.GetTxs(),
|
|
"resultGapPool", env.gasPool.Gas(),
|
|
"exitCause", breakCause)
|
|
})
|
|
}()
|
|
|
|
mainloop:
|
|
for {
|
|
// case of interrupting by timeout
|
|
if interruptCtx != nil {
|
|
// case of interrupting by timeout
|
|
select {
|
|
case <-interruptCtx.Done():
|
|
commitInterruptCounter.Inc(1)
|
|
log.Warn("Tx Level Interrupt")
|
|
break mainloop
|
|
default:
|
|
}
|
|
}
|
|
|
|
// In the following three cases, we will interrupt the execution of the transaction.
|
|
// (1) new head block event arrival, the interrupt signal is 1
|
|
// (2) worker start or restart, the interrupt signal is 1
|
|
// (3) worker recreate the sealing block with any newly arrived transactions, the interrupt signal is 2.
|
|
// For the first two cases, the semi-finished work will be discarded.
|
|
// For the third case, the semi-finished work will be submitted to the consensus engine.
|
|
if interrupt != nil && atomic.LoadInt32(interrupt) != commitInterruptNone {
|
|
// Notify resubmit loop to increase resubmitting interval due to too frequent commits.
|
|
if atomic.LoadInt32(interrupt) == commitInterruptResubmit {
|
|
ratio := float64(gasLimit-env.gasPool.Gas()) / float64(gasLimit)
|
|
if ratio < 0.1 {
|
|
ratio = 0.1
|
|
}
|
|
w.resubmitAdjustCh <- &intervalAdjust{
|
|
ratio: ratio,
|
|
inc: true,
|
|
}
|
|
}
|
|
|
|
breakCause = "interrupt"
|
|
return atomic.LoadInt32(interrupt) == commitInterruptNewHead
|
|
}
|
|
// If we don't have enough gas for any further transactions then we're done
|
|
if env.gasPool.Gas() < params.TxGas {
|
|
log.Trace("Not enough gas for further transactions", "have", env.gasPool, "want", params.TxGas)
|
|
|
|
breakCause = "Not enough gas for further transactions"
|
|
break
|
|
}
|
|
// Retrieve the next transaction and abort if all done
|
|
tx := txs.Peek()
|
|
if tx == nil {
|
|
breakCause = "all transactions has been included"
|
|
break
|
|
}
|
|
// Error may be ignored here. The error has already been checked
|
|
// during transaction acceptance is the transaction pool.
|
|
//
|
|
// We use the eip155 signer regardless of the current hf.
|
|
from, _ := types.Sender(env.signer, tx)
|
|
// Check whether the tx is replay protected. If we're not in the EIP155 hf
|
|
// phase, start ignoring the sender until we do.
|
|
if tx.Protected() && !w.chainConfig.IsEIP155(env.header.Number) {
|
|
log.Trace("Ignoring reply protected transaction", "hash", tx.Hash(), "eip155", w.chainConfig.EIP155Block)
|
|
|
|
txs.Pop()
|
|
continue
|
|
}
|
|
// Start executing the transaction
|
|
env.state.Prepare(tx.Hash(), env.tcount)
|
|
|
|
var start time.Time
|
|
|
|
log.OnDebug(func(log.Logging) {
|
|
start = time.Now()
|
|
})
|
|
|
|
logs, err := w.commitTransaction(env, tx)
|
|
|
|
switch {
|
|
case errors.Is(err, core.ErrGasLimitReached):
|
|
// Pop the current out-of-gas transaction without shifting in the next from the account
|
|
log.Trace("Gas limit exceeded for current block", "sender", from)
|
|
txs.Pop()
|
|
|
|
case errors.Is(err, core.ErrNonceTooLow):
|
|
// New head notification data race between the transaction pool and miner, shift
|
|
log.Trace("Skipping transaction with low nonce", "sender", from, "nonce", tx.Nonce())
|
|
txs.Shift()
|
|
|
|
case errors.Is(err, core.ErrNonceTooHigh):
|
|
// Reorg notification data race between the transaction pool and miner, skip account =
|
|
log.Trace("Skipping account with hight nonce", "sender", from, "nonce", tx.Nonce())
|
|
txs.Pop()
|
|
|
|
case errors.Is(err, nil):
|
|
// Everything ok, collect the logs and shift in the next transaction from the same account
|
|
coalescedLogs = append(coalescedLogs, logs...)
|
|
env.tcount++
|
|
txs.Shift()
|
|
|
|
log.OnDebug(func(lg log.Logging) {
|
|
lg("Committed new tx", "tx hash", tx.Hash(), "from", from, "to", tx.To(), "nonce", tx.Nonce(), "gas", tx.Gas(), "gasPrice", tx.GasPrice(), "value", tx.Value(), "time spent", time.Since(start))
|
|
})
|
|
|
|
case errors.Is(err, core.ErrTxTypeNotSupported):
|
|
// Pop the unsupported transaction without shifting in the next from the account
|
|
log.Trace("Skipping unsupported transaction type", "sender", from, "type", tx.Type())
|
|
txs.Pop()
|
|
|
|
default:
|
|
// Strange error, discard the transaction and get the next in line (note, the
|
|
// nonce-too-high clause will prevent us from executing in vain).
|
|
log.Debug("Transaction failed, account skipped", "hash", tx.Hash(), "err", err)
|
|
txs.Shift()
|
|
}
|
|
}
|
|
|
|
if !w.isRunning() && len(coalescedLogs) > 0 {
|
|
// We don't push the pendingLogsEvent while we are sealing. The reason is that
|
|
// when we are sealing, the worker will regenerate a sealing block every 3 seconds.
|
|
// In order to avoid pushing the repeated pendingLog, we disable the pending log pushing.
|
|
|
|
// make a copy, the state caches the logs and these logs get "upgraded" from pending to mined
|
|
// logs by filling in the block hash when the block was mined by the local miner. This can
|
|
// cause a race condition if a log was "upgraded" before the PendingLogsEvent is processed.
|
|
cpy := make([]*types.Log, len(coalescedLogs))
|
|
for i, l := range coalescedLogs {
|
|
cpy[i] = new(types.Log)
|
|
*cpy[i] = *l
|
|
}
|
|
w.pendingLogsFeed.Send(cpy)
|
|
}
|
|
// Notify resubmit loop to decrease resubmitting interval if current interval is larger
|
|
// than the user-specified one.
|
|
if interrupt != nil {
|
|
w.resubmitAdjustCh <- &intervalAdjust{inc: false}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// generateParams wraps various of settings for generating sealing task.
|
|
type generateParams struct {
|
|
timestamp uint64 // The timstamp for sealing task
|
|
forceTime bool // Flag whether the given timestamp is immutable or not
|
|
parentHash common.Hash // Parent block hash, empty means the latest chain head
|
|
coinbase common.Address // The fee recipient address for including transaction
|
|
random common.Hash // The randomness generated by beacon chain, empty before the merge
|
|
noUncle bool // Flag whether the uncle block inclusion is allowed
|
|
noExtra bool // Flag whether the extra field assignment is allowed
|
|
}
|
|
|
|
// prepareWork constructs the sealing task according to the given parameters,
|
|
// either based on the last chain head or specified parent. In this function
|
|
// the pending transactions are not filled yet, only the empty task returned.
|
|
func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
|
|
w.mu.RLock()
|
|
defer w.mu.RUnlock()
|
|
|
|
// Find the parent block for sealing task
|
|
parent := w.chain.CurrentBlock()
|
|
if genParams.parentHash != (common.Hash{}) {
|
|
parent = w.chain.GetBlockByHash(genParams.parentHash)
|
|
}
|
|
if parent == nil {
|
|
return nil, fmt.Errorf("missing parent")
|
|
}
|
|
// Sanity check the timestamp correctness, recap the timestamp
|
|
// to parent+1 if the mutation is allowed.
|
|
timestamp := genParams.timestamp
|
|
if parent.Time() >= timestamp {
|
|
if genParams.forceTime {
|
|
return nil, fmt.Errorf("invalid timestamp, parent %d given %d", parent.Time(), timestamp)
|
|
}
|
|
timestamp = parent.Time() + 1
|
|
}
|
|
// Construct the sealing block header, set the extra field if it's allowed
|
|
num := parent.Number()
|
|
header := &types.Header{
|
|
ParentHash: parent.Hash(),
|
|
Number: num.Add(num, common.Big1),
|
|
GasLimit: core.CalcGasLimit(parent.GasLimit(), w.config.GasCeil),
|
|
Time: timestamp,
|
|
Coinbase: genParams.coinbase,
|
|
}
|
|
if !genParams.noExtra && len(w.extra) != 0 {
|
|
header.Extra = w.extra
|
|
}
|
|
// Set the randomness field from the beacon chain if it's available.
|
|
if genParams.random != (common.Hash{}) {
|
|
header.MixDigest = genParams.random
|
|
}
|
|
// Set baseFee and GasLimit if we are on an EIP-1559 chain
|
|
if w.chainConfig.IsLondon(header.Number) {
|
|
header.BaseFee = misc.CalcBaseFeeUint(w.chainConfig, parent.Header()).ToBig()
|
|
if !w.chainConfig.IsLondon(parent.Number()) {
|
|
parentGasLimit := parent.GasLimit() * params.ElasticityMultiplier
|
|
header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil)
|
|
}
|
|
}
|
|
// Run the consensus preparation with the default or customized consensus engine.
|
|
if err := w.engine.Prepare(w.chain, header); err != nil {
|
|
switch err.(type) {
|
|
case *bor.UnauthorizedSignerError:
|
|
log.Debug("Failed to prepare header for sealing", "err", err)
|
|
default:
|
|
log.Error("Failed to prepare header for sealing", "err", err)
|
|
}
|
|
return nil, err
|
|
}
|
|
// Could potentially happen if starting to mine in an odd state.
|
|
// Note genParams.coinbase can be different with header.Coinbase
|
|
// since clique algorithm can modify the coinbase field in header.
|
|
env, err := w.makeEnv(parent, header, genParams.coinbase)
|
|
if err != nil {
|
|
log.Error("Failed to create sealing context", "err", err)
|
|
return nil, err
|
|
}
|
|
// Accumulate the uncles for the sealing work only if it's allowed.
|
|
if !genParams.noUncle {
|
|
commitUncles := func(blocks map[common.Hash]*types.Block) {
|
|
for hash, uncle := range blocks {
|
|
if len(env.uncles) == 2 {
|
|
break
|
|
}
|
|
if err := w.commitUncle(env, uncle.Header()); err != nil {
|
|
log.Trace("Possible uncle rejected", "hash", hash, "reason", err)
|
|
} else {
|
|
log.Debug("Committing new uncle to block", "hash", hash)
|
|
}
|
|
}
|
|
}
|
|
// Prefer to locally generated uncle
|
|
commitUncles(w.localUncles)
|
|
commitUncles(w.remoteUncles)
|
|
}
|
|
return env, nil
|
|
}
|
|
|
|
func startProfiler(profile string, filepath string, number uint64) (func() error, error) {
|
|
var (
|
|
buf bytes.Buffer
|
|
err error
|
|
)
|
|
|
|
closeFn := func() {}
|
|
|
|
switch profile {
|
|
case "cpu":
|
|
err = pprof.StartCPUProfile(&buf)
|
|
|
|
if err == nil {
|
|
closeFn = func() {
|
|
pprof.StopCPUProfile()
|
|
}
|
|
}
|
|
case "trace":
|
|
err = ptrace.Start(&buf)
|
|
|
|
if err == nil {
|
|
closeFn = func() {
|
|
ptrace.Stop()
|
|
}
|
|
}
|
|
case "heap":
|
|
runtime.GC()
|
|
|
|
err = pprof.WriteHeapProfile(&buf)
|
|
default:
|
|
log.Info("Incorrect profile name")
|
|
}
|
|
|
|
if err != nil {
|
|
return func() error {
|
|
closeFn()
|
|
return nil
|
|
}, err
|
|
}
|
|
|
|
closeFnNew := func() error {
|
|
var err error
|
|
|
|
closeFn()
|
|
|
|
if buf.Len() == 0 {
|
|
return nil
|
|
}
|
|
|
|
f, err := os.Create(filepath + "/" + profile + "-" + fmt.Sprint(number) + ".prof")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
_, err = f.Write(buf.Bytes())
|
|
|
|
return err
|
|
}
|
|
|
|
return closeFnNew, nil
|
|
}
|
|
|
|
// fillTransactions retrieves the pending transactions from the txpool and fills them
|
|
// into the given sealing block. The transaction selection and ordering strategy can
|
|
// be customized with the plugin in the future.
|
|
//
|
|
//nolint:gocognit
|
|
func (w *worker) fillTransactions(ctx context.Context, interrupt *int32, env *environment, interruptCtx context.Context) {
|
|
ctx, span := tracing.StartSpan(ctx, "fillTransactions")
|
|
defer tracing.EndSpan(span)
|
|
|
|
// Split the pending transactions into locals and remotes
|
|
// Fill the block with all available pending transactions.
|
|
|
|
var (
|
|
localTxsCount int
|
|
remoteTxsCount int
|
|
localTxs = make(map[common.Address]types.Transactions)
|
|
remoteTxs map[common.Address]types.Transactions
|
|
)
|
|
|
|
// TODO: move to config or RPC
|
|
const profiling = false
|
|
|
|
if profiling {
|
|
doneCh := make(chan struct{})
|
|
|
|
defer func() {
|
|
close(doneCh)
|
|
}()
|
|
|
|
go func(number uint64) {
|
|
closeFn := func() error {
|
|
return nil
|
|
}
|
|
|
|
for {
|
|
select {
|
|
case <-time.After(150 * time.Millisecond):
|
|
// Check if we've not crossed limit
|
|
if attempt := atomic.AddInt32(w.profileCount, 1); attempt >= 10 {
|
|
log.Info("Completed profiling", "attempt", attempt)
|
|
|
|
return
|
|
}
|
|
|
|
log.Info("Starting profiling in fill transactions", "number", number)
|
|
|
|
dir, err := os.MkdirTemp("", fmt.Sprintf("bor-traces-%s-", time.Now().UTC().Format("2006-01-02-150405Z")))
|
|
if err != nil {
|
|
log.Error("Error in profiling", "path", dir, "number", number, "err", err)
|
|
return
|
|
}
|
|
|
|
// grab the cpu profile
|
|
closeFnInternal, err := startProfiler("cpu", dir, number)
|
|
if err != nil {
|
|
log.Error("Error in profiling", "path", dir, "number", number, "err", err)
|
|
return
|
|
}
|
|
|
|
closeFn = func() error {
|
|
err := closeFnInternal()
|
|
|
|
log.Info("Completed profiling", "path", dir, "number", number, "error", err)
|
|
|
|
return nil
|
|
}
|
|
|
|
case <-doneCh:
|
|
err := closeFn()
|
|
|
|
if err != nil {
|
|
log.Info("closing fillTransactions", "number", number, "error", err)
|
|
}
|
|
|
|
return
|
|
}
|
|
}
|
|
}(env.header.Number.Uint64())
|
|
}
|
|
|
|
tracing.Exec(ctx, "", "worker.SplittingTransactions", func(ctx context.Context, span trace.Span) {
|
|
|
|
prePendingTime := time.Now()
|
|
|
|
pending := w.eth.TxPool().Pending(ctx, true)
|
|
remoteTxs = pending
|
|
|
|
postPendingTime := time.Now()
|
|
|
|
for _, account := range w.eth.TxPool().Locals() {
|
|
if txs := remoteTxs[account]; len(txs) > 0 {
|
|
delete(remoteTxs, account)
|
|
localTxs[account] = txs
|
|
}
|
|
}
|
|
|
|
postLocalsTime := time.Now()
|
|
|
|
localTxsCount = len(localTxs)
|
|
remoteTxsCount = len(remoteTxs)
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("len of local txs", localTxsCount),
|
|
attribute.Int("len of remote txs", remoteTxsCount),
|
|
attribute.String("time taken by Pending()", fmt.Sprintf("%v", postPendingTime.Sub(prePendingTime))),
|
|
attribute.String("time taken by Locals()", fmt.Sprintf("%v", postLocalsTime.Sub(postPendingTime))),
|
|
)
|
|
})
|
|
|
|
var (
|
|
localEnvTCount int
|
|
remoteEnvTCount int
|
|
committed bool
|
|
)
|
|
|
|
if localTxsCount > 0 {
|
|
var txs *types.TransactionsByPriceAndNonce
|
|
|
|
tracing.Exec(ctx, "", "worker.LocalTransactionsByPriceAndNonce", func(ctx context.Context, span trace.Span) {
|
|
txs = types.NewTransactionsByPriceAndNonce(env.signer, localTxs, cmath.FromBig(env.header.BaseFee))
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("len of tx local Heads", txs.GetTxs()),
|
|
)
|
|
})
|
|
|
|
tracing.Exec(ctx, "", "worker.LocalCommitTransactions", func(ctx context.Context, span trace.Span) {
|
|
committed = w.commitTransactions(env, txs, interrupt, interruptCtx)
|
|
})
|
|
|
|
if committed {
|
|
return
|
|
}
|
|
|
|
localEnvTCount = env.tcount
|
|
}
|
|
|
|
if remoteTxsCount > 0 {
|
|
var txs *types.TransactionsByPriceAndNonce
|
|
|
|
tracing.Exec(ctx, "", "worker.RemoteTransactionsByPriceAndNonce", func(ctx context.Context, span trace.Span) {
|
|
txs = types.NewTransactionsByPriceAndNonce(env.signer, remoteTxs, cmath.FromBig(env.header.BaseFee))
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("len of tx remote Heads", txs.GetTxs()),
|
|
)
|
|
})
|
|
|
|
tracing.Exec(ctx, "", "worker.RemoteCommitTransactions", func(ctx context.Context, span trace.Span) {
|
|
committed = w.commitTransactions(env, txs, interrupt, interruptCtx)
|
|
})
|
|
|
|
if committed {
|
|
return
|
|
}
|
|
|
|
remoteEnvTCount = env.tcount
|
|
}
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("len of final local txs ", localEnvTCount),
|
|
attribute.Int("len of final remote txs", remoteEnvTCount),
|
|
)
|
|
}
|
|
|
|
// generateWork generates a sealing block based on the given parameters.
|
|
func (w *worker) generateWork(ctx context.Context, params *generateParams) (*types.Block, error) {
|
|
work, err := w.prepareWork(params)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer work.discard()
|
|
|
|
interruptCtx, stopFn := getInterruptTimer(ctx, work, w.chain.CurrentBlock())
|
|
defer stopFn()
|
|
|
|
w.fillTransactions(ctx, nil, work, interruptCtx)
|
|
|
|
return w.engine.FinalizeAndAssemble(ctx, w.chain, work.header, work.state, work.txs, work.unclelist(), work.receipts)
|
|
}
|
|
|
|
// commitWork generates several new sealing tasks based on the parent block
|
|
// and submit them to the sealer.
|
|
func (w *worker) commitWork(ctx context.Context, interrupt *int32, noempty bool, timestamp int64) {
|
|
|
|
start := time.Now()
|
|
|
|
var (
|
|
work *environment
|
|
err error
|
|
)
|
|
|
|
tracing.Exec(ctx, "", "worker.prepareWork", func(ctx context.Context, span trace.Span) {
|
|
// Set the coinbase if the worker is running or it's required
|
|
var coinbase common.Address
|
|
if w.isRunning() {
|
|
if w.coinbase == (common.Address{}) {
|
|
log.Error("Refusing to mine without etherbase")
|
|
return
|
|
}
|
|
|
|
coinbase = w.coinbase // Use the preset address as the fee recipient
|
|
}
|
|
|
|
work, err = w.prepareWork(&generateParams{
|
|
timestamp: uint64(timestamp),
|
|
coinbase: coinbase,
|
|
})
|
|
})
|
|
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
//nolint:contextcheck
|
|
var interruptCtx = context.Background()
|
|
|
|
stopFn := func() {}
|
|
defer func() {
|
|
stopFn()
|
|
}()
|
|
|
|
if !noempty {
|
|
interruptCtx, stopFn = getInterruptTimer(ctx, work, w.chain.CurrentBlock())
|
|
}
|
|
|
|
ctx, span := tracing.StartSpan(ctx, "commitWork")
|
|
defer tracing.EndSpan(span)
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("number", int(work.header.Number.Uint64())),
|
|
)
|
|
|
|
// Create an empty block based on temporary copied state for
|
|
// sealing in advance without waiting block execution finished.
|
|
if !noempty && atomic.LoadUint32(&w.noempty) == 0 {
|
|
err = w.commit(ctx, work.copy(), nil, false, start)
|
|
if err != nil {
|
|
return
|
|
}
|
|
}
|
|
|
|
// Fill pending transactions from the txpool
|
|
w.fillTransactions(ctx, interrupt, work, interruptCtx)
|
|
|
|
err = w.commit(ctx, work.copy(), w.fullTaskHook, true, start)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
// Swap out the old work with the new one, terminating any leftover
|
|
// prefetcher processes in the mean time and starting a new one.
|
|
if w.current != nil {
|
|
w.current.discard()
|
|
}
|
|
|
|
w.current = work
|
|
}
|
|
|
|
func getInterruptTimer(ctx context.Context, work *environment, current *types.Block) (context.Context, func()) {
|
|
delay := time.Until(time.Unix(int64(work.header.Time), 0))
|
|
|
|
interruptCtx, cancel := context.WithTimeout(context.Background(), delay)
|
|
|
|
blockNumber := current.NumberU64() + 1
|
|
|
|
go func() {
|
|
select {
|
|
case <-interruptCtx.Done():
|
|
if interruptCtx.Err() != context.Canceled {
|
|
log.Info("Commit Interrupt. Pre-committing the current block", "block", blockNumber)
|
|
cancel()
|
|
}
|
|
case <-ctx.Done(): // nothing to do
|
|
}
|
|
}()
|
|
|
|
return interruptCtx, cancel
|
|
}
|
|
|
|
// commit runs any post-transaction state modifications, assembles the final block
|
|
// and commits new work if consensus engine is running.
|
|
// Note the assumption is held that the mutation is allowed to the passed env, do
|
|
// the deep copy first.
|
|
func (w *worker) commit(ctx context.Context, env *environment, interval func(), update bool, start time.Time) error {
|
|
if w.isRunning() {
|
|
ctx, span := tracing.StartSpan(ctx, "commit")
|
|
defer tracing.EndSpan(span)
|
|
|
|
if interval != nil {
|
|
interval()
|
|
}
|
|
|
|
// Create a local environment copy, avoid the data race with snapshot state.
|
|
// https://github.com/ethereum/go-ethereum/issues/24299
|
|
env := env.copy()
|
|
|
|
block, err := w.engine.FinalizeAndAssemble(ctx, w.chain, env.header, env.state, env.txs, env.unclelist(), env.receipts)
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("number", int(env.header.Number.Uint64())),
|
|
attribute.String("hash", env.header.Hash().String()),
|
|
attribute.String("sealhash", w.engine.SealHash(env.header).String()),
|
|
attribute.Int("len of env.txs", len(env.txs)),
|
|
attribute.Bool("error", err != nil),
|
|
)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// If we're post merge, just ignore
|
|
if !w.isTTDReached(block.Header()) {
|
|
select {
|
|
case w.taskCh <- &task{ctx: ctx, receipts: env.receipts, state: env.state, block: block, createdAt: time.Now()}:
|
|
w.unconfirmed.Shift(block.NumberU64() - 1)
|
|
log.Info("Commit new sealing work", "number", block.Number(), "sealhash", w.engine.SealHash(block.Header()),
|
|
"uncles", len(env.uncles), "txs", env.tcount,
|
|
"gas", block.GasUsed(), "fees", totalFees(block, env.receipts),
|
|
"elapsed", common.PrettyDuration(time.Since(start)))
|
|
|
|
case <-w.exitCh:
|
|
log.Info("Worker has exited")
|
|
}
|
|
}
|
|
}
|
|
if update {
|
|
w.updateSnapshot(env)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// getSealingBlock generates the sealing block based on the given parameters.
|
|
func (w *worker) getSealingBlock(parent common.Hash, timestamp uint64, coinbase common.Address, random common.Hash) (*types.Block, error) {
|
|
ctx := tracing.WithTracer(context.Background(), otel.GetTracerProvider().Tracer("getSealingBlock"))
|
|
|
|
req := &getWorkReq{
|
|
params: &generateParams{
|
|
timestamp: timestamp,
|
|
forceTime: true,
|
|
parentHash: parent,
|
|
coinbase: coinbase,
|
|
random: random,
|
|
noUncle: true,
|
|
noExtra: true,
|
|
},
|
|
result: make(chan *types.Block, 1),
|
|
ctx: ctx,
|
|
}
|
|
|
|
select {
|
|
case w.getWorkCh <- req:
|
|
block := <-req.result
|
|
if block == nil {
|
|
return nil, req.err
|
|
}
|
|
|
|
return block, nil
|
|
case <-w.exitCh:
|
|
return nil, errors.New("miner closed")
|
|
}
|
|
}
|
|
|
|
// isTTDReached returns the indicator if the given block has reached the total
|
|
// terminal difficulty for The Merge transition.
|
|
func (w *worker) isTTDReached(header *types.Header) bool {
|
|
td, ttd := w.chain.GetTd(header.ParentHash, header.Number.Uint64()-1), w.chain.Config().TerminalTotalDifficulty
|
|
return td != nil && ttd != nil && td.Cmp(ttd) >= 0
|
|
}
|
|
|
|
// copyReceipts makes a deep copy of the given receipts.
|
|
func copyReceipts(receipts []*types.Receipt) []*types.Receipt {
|
|
result := make([]*types.Receipt, len(receipts))
|
|
for i, l := range receipts {
|
|
cpy := *l
|
|
result[i] = &cpy
|
|
}
|
|
return result
|
|
}
|
|
|
|
// postSideBlock fires a side chain event, only use it for testing.
|
|
func (w *worker) postSideBlock(event core.ChainSideEvent) {
|
|
select {
|
|
case w.chainSideCh <- event:
|
|
case <-w.exitCh:
|
|
}
|
|
}
|
|
|
|
// totalFees computes total consumed miner fees in ETH. Block transactions and receipts have to have the same order.
|
|
func totalFees(block *types.Block, receipts []*types.Receipt) *big.Float {
|
|
feesWei := new(big.Int)
|
|
for i, tx := range block.Transactions() {
|
|
minerFee, _ := tx.EffectiveGasTip(block.BaseFee())
|
|
feesWei.Add(feesWei, new(big.Int).Mul(new(big.Int).SetUint64(receipts[i].GasUsed), minerFee))
|
|
}
|
|
return new(big.Float).Quo(new(big.Float).SetInt(feesWei), new(big.Float).SetInt(big.NewInt(params.Ether)))
|
|
}
|