mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-06 03:53:47 +00:00
* ethdb/pebble: fix nil callbacks (#26650) * eth/downloader: fix timeout resurrection panic (#26652) * common/prque, eth/downloader: fix timeout resurrection panic * common/prque: revert -1 hack for les, temporaryly! * core/state, trie: remove unused error-return from trie Commit operation (#26641) * go.mod: update pebble to latest master (#26654) * core/vm: set tracer-observable `value` of a delegatecall to match parent `value` (#26632) This is a breaking change in the tracing hooks API as well as semantics of the callTracer: - CaptureEnter hook provided a nil value argument in case of DELEGATECALL. However to stay consistent with how delegate calls behave in EVM this hook is changed to pass in the value of the parent call. - callTracer will return parent call's value for DELEGATECALL frames. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * ethdb: add benchmark test suite (#26659) * params: schedule shanghai fork on sepolia (#26662) * params: schedule shanghai fork on sepolia * params: u64 -> newUint64 * eth/filters: avoid block body retrieval when no matching logs (#25199) Logs stored on disk have minimal information. Contextual information such as block number, index of log in block, index of transaction in block are filled in upon request. We can fill in all these fields only having the block header and list of receipts. But determining the transaction hash of a log requires the block body. The goal of this PR is postponing this retrieval until we are sure we the transaction hash. It happens often that the header bloom filter signals there might be matches in a block, but after actually checking them reveals the logs do not match. We want to avoid fetching the body in this case. Note that this changes the semantics of Backend.GetLogs. Downstream callers of GetLogs now assume log context fields have not been derived, and need to call DeriveFields on the logs if necessary. * eth/tracers: more fork overrides in traceBlockToFile (#26655) This change allows all post-Berlin forks to be specified as overrides for futureForkBlock in the config parameter for traceBlockToFile. * tests/fuzzers: supply gnark multiexp config, fixes #26669 (#26670) This change fixes a fuzzer which broke when we updated the gnark dependency earlier. * cmd/devp2p: reduce output of node crawler (#26674) Our discovery crawler spits out a huge amount of logs, most of which is pretty non-interesting. This change moves the very verbose output to Debug, and adds a 8-second status log message giving the general idea about what's going on. * params: update mainnet + rinkeby CHT (#26677) This change updates the CHT entries for mainnet and rinkeby * eth/filters: replace atomic pointer with value (#26689) * eth/filters: replace atomic.Pointer * fix * improve Co-authored-by: Martin Holst Swende <martin@swende.se> --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * p2p/dnsdisc: fix tests with Go 1.20 (#26690) * eth/catalyst: return error if withdrawals are nil post-shanghai (#26691) Spec: https://github.com/ethereum/execution-apis/blob/main/src/engine/shanghai.md#request * ethdb/pebble: Fix `MemTableStopWritesThreshold` (#26692) MemTableStopWritesThreshold was set to the max size of all memtables before blocking writing but should be set to the max number of memtables. This is documented [here](https://github.com/cockroachdb/pebble/blob/master/options.go#L738-L742). * eth/downloader: handle missing withdrawals if empty list is expected (#26675) This PR relaxes the block body ingress handling a bit: if block body withdrawals are missing (but expected to be empty), the body withdrawals are set to 'empty list' before being passed to upper layers. This fixes an issue where a block passed from EthereumJS to geth was deemed invalid. * params: go-ethereum v1.11.0 stable * params: begin v1.11.1 release cycle * travis, build: update Go to 1.20.1 (#26653) travis, build: update Go to 1.20 * core: check genesis state presence by disk read (#26703) * core, eth/downloader: make body validation more strict (#26704) * eth/downloader: fix empty-body case in queue fetchresult (#26707) * eth/downloader: fix typo (#26716) * all: remove deprecated uses of math.rand (#26710) This PR is a (superior) alternative to https://github.com/ethereum/go-ethereum/pull/26708, it handles deprecation, primarily two specific cases. `rand.Seed` is typically used in two ways - `rand.Seed(time.Now().UnixNano())` -- we seed it, just to be sure to get some random, and not always get the same thing on every run. This is not needed, with global seeding, so those are just removed. - `rand.Seed(1)` this is typically done to ensure we have a stable test. If we rely on this, we need to fix up the tests to use a deterministic prng-source. A few occurrences like this has been replaced with a proper custom source. `rand.Read` has been replaced by `crypto/rand`.`Read` in this PR. * params: go-ethereum v1.11.1 stable * params: begin v1.11.2 release cycle * eth/catalyst: send INVALID instead of INVALID_BLOCK_HASH (#26696) This change will break one hive test, but pass another and it will be the better way going forward * ci: disable coverage reporting in appveyor and travis * eth/catalyst: request too large error (#26722) The method `GetPayloadBodiesByRangeV1` now returns "-38004: Too large request" error if the requested range is too large, according to spec Co-authored-by: Martin Holst Swende <martin@swende.se> * core/trie: remove trie tracer (#26665) This PR contains a small portion of the full pbss PR, namely Remove the tracer from trie (and comitter), and instead using an accessList. Related changes to the Nodeset. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * rpc: fix unmarshaling of null result in CallContext (#26723) The change fixes unmarshaling of JSON null results into json.RawMessage. --------- Co-authored-by: Jason Yuan <jason.yuan@curvegrid.com> Co-authored-by: Jason Yuan <jason.yuan869@gmail.com> * build: ship bootstrapper Go along with builder for PPA (#26731) * build: fix setting env var, temp early exit * build: fix gobootstrap path for the PPA * build: add some PPA debug logs, sigh * internal/build: revert raising the chunk size for PPA * build: yet another weird PPA fix * build: fix (finaly?) the PPA env vars for Go bootstrapping * build: fix Go 1.19.0 bootstrapper issues on 386 PPA * build: enable Lunar Lobster PPA builds * Revert "core/trie: remove trie tracer (#26665)" (#26732) This reverts commit7c749c947a. * cmd/geth: clarify dumpconfig options (#26729) Clarifies the documentation around dumpconfi Signed-off-by: Sungwoo Kim <git@sung-woo.kim> * core, eth: merge snap-sync chain download progress logs (#26676) * core: fix accessor mismatch for genesis state (#26747) * core/rawdb: expose chain freezer constructor without internals (#26748) * all: use unified emptyRootHash and emptyCodeHash (#26718) The EmptyRootHash and EmptyCodeHash are defined everywhere in the codebase, this PR replaces all of them with unified one defined in core/types package, and also defines constants for TxRoot, WithdrawalsRoot and UncleRoot * eth/filters: fix a breaking change and return rpctransaction (#26757) * eth/filters: fix a breaking change and return rpctransaction * eth/filters: fix test cases --------- Co-authored-by: Catror <me@catror.com> * common/math: allow HexOrDecimal to accept unquoted decimals too (#26758) * params: release Geth v1.11.2 * params: begin v.1.11.3 release cycle * log: improve documentation (#26753) Add usage examples * core/rawdb, node: use standalone flock dependency (#26633) * eth: use the last announced finalized block as the sync ancient limit (#26685) * cmd/devp2p: faster crawling + less verbose dns updates (#26697) This improves the speed of DHT crawling by using concurrent requests. It also removes logging of individual DNS updates. * eth/tracers: add native flatCallTracer (aka parity style tracer) (#26377) Adds support for a native call tracer with the Parity format, which outputs call frames in a flat array. This tracer accepts the following options: - `convertParityErrors: true` will convert error messages to match those of Parity - `includePrecompiles: true` will report all calls to precompiles. The default matches Parity's behavior where CALL and STATICCALLs to precompiles are excluded Incompatibilities with Parity include: - Parity removes the result object in case of failure. This behavior is maintained with the exception of reverts. Revert output usually contains useful information, i.e. Solidity revert reason. - The `gasUsed` field accounts for intrinsic gas (e.g. 21000 for simple transfers) and refunds unlike Parity - Block rewards are not reported Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * core: improve withdrawal index assignment in GenerateChain (#26756) This fixes an issue where the withdrawal index was not calculated correctly for multiple withdrawals in a single block. Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * ethdb/pebble: fix range compaction (#26771) * ethdb/pebble: fix range compaction * ethdb/pebble: add comment * ethdb/pebble: fix max memorytable size (#26776) * ethclient: include withdrawals in ethclient block responses (#26778) * include withdrawals in ethclient responses * omit empty withdrawals array in json serialization * all: change chain head markers from block to header (#26777) * core/rawdb, ethdb/pebble: disable pebble on openbsd (#26801) * core: fix a merge fault (#26802) * README, go.mod, event, internal/version: bump min Go to 1.19 (#26803) * travi: remove strange leftover Go version * core, params: schedule Shanghai on goerli (#26795) * core: params: schedule Shanghai on goerli * core/forkid: fix comment * eth: remove admin.peers[i].eth.head and difficulty (#26804) * core/types: add EffectiveGasPrice in Receipt (#26713) This change adds a struct field EffectiveGasPrice in types.Receipt. The field is present in RPC responses, but not in the Go struct, and thus can't easily be accessed via ethclient. Co-authored-by: PulsarAI <dev@pulsar-systems.fi> * core, eth/catalyst: fix race conditions in tests (#26790) Fixes a race in TestNewPayloadOnInvalidTerminalBlock where setting the TTD raced with the miner. Solution: set the TTD on the blockchain config not the genesis config. Also fixes a race in CopyHeader which resulted in race reports all over the place. * metrics: improve accuracy of CPU gauges (#26793) This PR changes metrics collection to actually measure the time interval between collections, rather than assume 3 seconds. I did some ad hoc profiling, and on slower hardware (eg, my Raspberry Pi 4) I routinely saw intervals between 3.3 - 3.5 seconds, with some being as high as 4.5 seconds. This will generally cause the CPU gauge readings to be too high, and in some cases can cause impossibly large values for the CPU load metrics (eg. greater than 400 for a 4 core CPU). --------- Co-authored-by: Felix Lange <fjl@twurst.com> * ethclient: fix panic when requesting missing blocks (#26817) This fixes a regression introduced by #26723. Fixes #26816. * core, miner: revert block gas counter in case of invalid transaction (#26799) This change fixes a flaw where, in certain scenarios, the block sealer did not accurately reset the remaining gas after failing to include an invalid transaction. Fixes #26791 * internal/ethapi: add tests for transaction types JSON marshal/unmarshal (#26667) Checks that Transaction.MarshalJSON and newRPCTransaction JSON output can be parsed by Transaction.UnmarshalJSON --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd/evm: correct `alloc` for `t8n` testdata (#26822) Fixes a minor error in the testdata * eth/tracers/native: set created address to nil in case of failure (#26779) Fixes #26073 * accounts/usbwallet: mitigate ledger app chunking issue (#26773) This PR mitigates an issue with Ledger's on-device RLP deserialization, see https://github.com/LedgerHQ/app-ethereum/issues/409 Ledger's RLP deserialization code does not validate the length of the RLP list received, and it may prematurely enter the signing flow when a APDU chunk boundary falls immediately before the EIP-155 chain_id when deserializing a transaction. Since the chain_id is uninitialized, it is 0 during this signing flow. This may cause the user to accidentally sign the transaction with chain_id = 0. That signature would be returned from the device 1 packet earlier than expected by the communication loop. The device blocks the second-to-last packet waiting for the signer flow, and then errors on the successive packet (which contains the chain_id, zeroed r, and zeroed s) Since the signature's early arrival causes successive errors during the communication process, geth does not parse the improper signature produced by the device, and therefore no improperly-signed transaction can be created. User funds are not at risk. We mitigate by selecting the highest chunk size that leaves at least 4 bytes in the final chunk. * beacon/engine: don't omit empty withdrawals in ExecutionPayloadBodies (#26698) This ensures the "withdrawals" field will always be present in responses to getPayloadBodiesByRangeV1 and getPayloadBodiesByHashV1. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build: update to go 1.20.2 (#26824) * params: go-ethereum v1.11.3 stable * params: begin v1.11.4 release cycle * core/rawdb: find smallest block stored in key-value store when chain gapped (#26719) This change prints out more information about the problem, in the case where geth detects a gap between leveldb and ancients, so we can determine more exactly where the gap is (what the first missing is). Also prints out more metadata. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * signer/core: accept all solidity primitive types for EIP-712 signing (#26770) Accept all primitive types in Solidity for EIP-712 from intN, uintN, intN[], uintN[] for N as 0 to 256 in multiples of 8 --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * params: remove EF azure bootnodes (#26828) * core/vm: use golang native big.Int (#26834) reverts #26021, to use the upstream bigint instead. * core/vm: fix typo in comment (#26838) fixes eip 220 -> 2200 * core/forkid: fix issue in validation test (#26544) This changes the test to match the comment description. Using timestampedConfig in this test case is incorrect, the comment says 'local is at Gray Glacier' and isn't aware of more forks. * cmd/evm: update readmes for the tests (#26841) * core, core/types: plain Message struct (#25977) Here, the core.Message interface turns into a plain struct and types.Message gets removed. This is a breaking change to packages core and core/types. While we do not promise API stability for package core, we do for core/types. An exception can be made for types.Message, since it doesn't have any purpose apart from invoking the state transition in package core. types.Message was also marked deprecated by the same commit it got added in,4dca5d4db7(November 2016). The core.Message interface was added in December 2014, in commitdb494170dc, for the purpose of 'testing' state transitions. It's the same change that made transaction struct fields private. Before that, the state transition used *types.Transaction directly. Over time, multiple implementations of the interface accrued across different packages, since constructing a Message is required whenever one wants to invoke the state transition. These implementations all looked very similar, a struct with private fields exposing the fields as accessor methods. By changing Message into a struct with public fields we can remove all these useless interface implementations. It will also hopefully simplify future changes to the type with less updates to apply across all of go-ethereum when a field is added to Message. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * travis: only build PPAs nightly, not on every push, too heavy (#26846) * p2p: small comment typo (#26850) Update server.go * core: add Timestamp method in BlockGen (#26844) Since forks are now scheduled by block time, it can be necessary to check the timestamp of a block while generating transactions. * core/txpool: implement additional DoS defenses (#26648) This adds two new rules to the transaction pool: - A future transaction can not evict a pending transaction. - A transaction can not overspend available funds of a sender. --- Co-authored-by: dwn1998 <42262393+dwn1998@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * params: go-ethereum v1.11.4 stable * params: begin v1.11.5 release cycle * tests: define `MuirGlacier` fork (#26856) add muir glacier to t8n * code/vm: fix comment typo (#26865) it should be constantinople rather than contantinople * core: minor code refactor (#26852) * core: refactor code * core: drop it from this anonymous goroutine func * core/txpool: use priceList.Put instead of heap.Push (#26863) Minor refactor to use the 'intended' accessor * eth: return error if 'safe' or 'finalized' tag used pre-merge (#26862) Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com> * .travis.yml: reenable PPA build on tag push (#26873) * core/state, trie: port changes from PBSS (#26763) * p2p/discover: pass invalid discv5 packets to Unhandled channel (#26699) This makes it possible to run another protocol alongside discv5, by reading unhandled packets from the channel. * all: update links in documentation (#26882) Co-authored-by: Stephen Flynn <stephen.flynn@gapac.com> * Increase websocket frame size (from erigon rpc client) (#26883) This increases the maximum allowed message size to 32MB. Originally submitted at https://github.com/ledgerwatch/erigon/pull/2739 example block failure: https://etherscan.io/tx/0x1317d973a55cedf9b0f2df6ea48e8077dd176f5444a3423368a46d6e4db89982#internal * cmd/devp2p, cmd/geth: add version in --help output (#26895) Not sure why this was removed, it's pretty useful to see the version also in --help. * core: show db error-info in case of mismatched hash root (#26870) When a database failure occurs, bubble it up a into statedb, and report it in suitable places, such as during a 'bad block' report. * consensus: improve consensus engine definition (#26871) Makes clear the distinction between Finalize and FinalizedAndAssemble: - In Finalize function, a series of state operations are applied according to consensus rules. The statedb is mutated and the root hash can be checked and compared afterwards. This function should be used in block processing(receive afrom network and apply it locally) but not block generation. - In FinalizeAndAssemble function, after applying state mutations, the block is also to be assembled with the latest state root computed, updating the header. This function should be used in block generation only. * eth/catalyst: increase update consensus timeout (#26840) Increases the time between consensus updates that we give the CL before we start warning the user. * internal/ethapi: avoid int overflow in GetTransactionReceipt (#26911) * trie, accounts/abi: add error-checks (#26914) * rlp: support for uint256 (#26898) This adds built-in support in package rlp for encoding, decoding and generating code dealing with uint256.Int. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * eth: fix output file permissions in admin_exportChain (#26912) * api: Use 0700 file permissions for ExportChain * change perm to 0644 * Update api.go --------- Co-authored-by: Felix Lange <fjl@twurst.com> * trie: reduce unit test time (#26918) * core/txpool: use atomic int added in go1.19 (#26913) Makes use of atomic.Uint64 instead of atomic by pointer * params: schedule shanghai fork on mainnet (#26908) Schedules the shanghai hardfork on timestamp 1681338455 as discussed on ACDE 157: https://github.com/ethereum/execution-specs/pull/727 * core/txpool: allow future local transactions (#26930) Local transactions should not be subject to the "future shouldn't churn pending txs" rule * params: go-ethereum v1.11.5 stable * params: begin v1.11.6 release cycle * build: allow building nightly archives via cron jobs (#26938) * log: add special casing of uint256 into the logger (#26936) * core/rawdb: use atomic int added in go1.19 (#26935) * core/vm: expose jumptable constructors (#26880) When interacting with geth as a library to e.g. produce state tests, it is desirable to obtain the consensus-correct jumptable definition for a given fork. This changes adds accessors so the instructionset can be obtained and characteristics about opcodes can be inspected. * eth/catalyst: fix races (#26950) * core/rawdb: update freezertable read meter (#26946) The meter for "for measuring the effective amount of data read" within the freezertable was never updated. This change remedies that. --------- Signed-off-by: jsvisa <delweng@gmail.com> * cmd/evm, tests: record preimages if dump is expected (#26955) With #25287 we made it so that preimages were not recorded by default. This had the side effect that the evm command is no longer able to dump state since it does a preimage lookup to determine the address represented by a key. This change enables the recording of preimages when the dump command is given. * core/state: add account address to Trie slot accessors (#26934) This changes the Trie interface to add the plain account address as a parameter to all storage-related methods. After the introduction of the TryAccount* functions, TryGet, TryUpdate and TryDelete are now only meant to read an account's storage. In their current form, they assume that an account storage is stored in a separate trie, and that the hashing of the slot is independent of its account's address. The proposed structure for a stateless storage breaks these two assumptions: the hashing of a slot key requires the address and all slots and accounts are stored in a single trie. This PR therefore adds an address parameter to the interface. It is ignored in the MPT version, so this change has no functional impact, however it will reduce the diff size when merging verkle trees. * metrics: add cpu counters (#26796) This PR adds counter metrics for the CPU system and the Geth process. Currently the only metrics available for these items are gauges. Gauges are fine when the consumer scrapes metrics data at the same interval as Geth produces new values (every 3 seconds), but it is likely that most consumers will not scrape that often. Intervals of 10, 15, or maybe even 30 seconds are probably more common. So the problem is, how does the consumer estimate what the CPU was doing in between scrapes. With a counter, it's easy ... you just subtract two successive values and divide by the time to get a nice, accurate average. But with a gauge, you can't do that. A gauge reading is an instantaneous picture of what was happening at that moment, but it gives you no idea about what was going on between scrapes. Taking an average of values is meaningless. * metrics/influxdb: use smaller dependency and reuse code between v1 and v2 reporters (#26963) This change switches to use the smaller influxdata/influxdb1-client package instead of depending on the whole infuxdb package. The new smaller client is very similar to the influxdb-v2 client, which made it possible to refactor the two reporters to reuse code a lot more. * eth/gasprice: change feehistory input type from int to uint64 (#26922) Change input param type from int to uint64 * go.mod: update golang.org/x/tools (#26960) * rlp/rlpgen: print want/expect output string if mismatch (#26932) Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * ethclient: ensure returned subscription is nil on error (#26976) * core/state, trie: remove Try prefix in Trie accessors (#26975) This change renames StateTrie methods to remove the Try* prefix. We added the Trie methods with prefix 'Try' a long time ago, working around the problem that most existing methods of Trie did not return the database error. This weird naming convention has persisted until now. Co-authored-by: Gary Rong <garyrong0905@gmail.com> * metrics/librato: ensure resp.body closed (#26969) This change ensures that we call Close on a http response body, in various places in the source code (mostly tests) * core/vm: use atomic.Bool (#26951) Make use of new atomic types --------- Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * core/bloombits: use atomic type (#26993) * core/state: use atomic.Bool (#26992) * graphql: fix data races (#26965) Fixes multiple data races caused by the fact that resolving fields are done concurrently by the graphql library. It also enforces caching at the stateobject level for account fields. * eth/tracers/native: prevent panic for LOG edge-cases (#26848) This PR fixes OOM panic in the callTracer as well as panicing on opcode validation errors (e.g. stack underflow) in callTracer and prestateTracer. Co-authored-by: Martin Holst Swende <martin@swende.se> * internal/debug: add log.logfmt flag to set logging to use logfmt (#26970) * docs: update outdated DeriveSha docs comment (#26968) * remove @gballet as a GraphQL codeowner (#27012) * core: use atomic type (#27011) * graphql: revert storage access regression (#27007) * cmd/geth: Add `--log.format` cli param (#27001) Removes the new --log.logfmt directive and hides --log.json, replacing both with log.format=(json|logfmt|terminal). The hidden log.json option is still respected if log.format is not specified for backwards compatibility. Co-authored-by: Martin Holst Swende <martin@swende.se> * ethdb/pebble: use atomic type (#27014) * common: fix json marshaller MixedcaseAddress (#26998) Fix the json marshaller of MixedcaseAddress * eth/catalyst: improve consensus heartbeat (#26896) improve the heartbeat function that is no longer suitable in the current situation Co-authored-by: “openex27” <“openexkevin@gmail.com”> * miner: use atomic type (#27013) Use the new typed atomics in the miner package * accounts/abi/bind: handle UnpackLog with zero topics (#26920) Adds error handling for the case that UnpackLog or UnpackLogIntoMap is called with a log that has zero topics. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * cmd/evm: use correct parent number for t8n base fee calculation (#27032) Currently the t8n tool uses the same block number for the current block and its parent while calculating the base fee. This causes incorrect base fee calculation for the london fork block. This commit sets the parent block number to be one less than the current block number * go.mod : update snappy (#27027) * common: delete MakeName (#27023) common,p2p: remove unused function MakeName * cmd/geth: enable log rotation (#26843) This change enables log rotation, which can be activated using the flag --log.rotate. Additional parameters that can be given are: - log.maxsize to set maximum size before files are rotated, - log.maxbackups to set how many files are retailed, - log.maxage to configure max age of rotated files, - log.compress whether to compress rotated files The way to configure location of the logfile(s) is left unchanged, via the `log.logfile` parameter. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd, miner, signer: avoid panic if keystore is not available (#27039) * cmd, miner, singer: avoid panic if keystore is not available * cmd/geth: print warning instead of panic * test/fuzzers: fuzz rlp handling of big.Int and uint256.Int (#26917) test/fuzzers: fuzz rlp handling of big.Lnt and uint256.Int * core/txpool: move some validation to outside of mutex (#27006) Currently, most of transaction validation while holding the txpool mutex: one exception being an early-on signature check. This PR changes that, so that we do all non-stateful checks before we entering the mutex area. This means they can be performed in parallel, and to enable that, certain fields have been made atomic bools and uint64. * eth/downloader: use atomic types (#27030) * eth/downloader: use atomic type * Update eth/downloader/downloader_test.go Co-authored-by: Martin Holst Swende <martin@swende.se> * Update eth/downloader/downloader_test.go Co-authored-by: Martin Holst Swende <martin@swende.se> --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * core/vm: clarify comment (#27045) * consensus, core/typer: add 4844 excessDataGas to header, tie it to Cancun (#27046) * consensus/misc, params: add EIP-4844 blobfee conversions (#27041) * consensus/misc, params: add EIP-4844 blobfee conversions * consensus/misc: pull in fakeExponential test cases * consensus/misc: reuse bigints * consensus/misc: nit renames, additional larger testcase --------- Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/tracers: report correct gasLimit in call tracers (#27029) This includes a semantic change to the `callTracer` as well as `flatCallTracer`. The value of field `gas` in the **first** call frame will change as follows: - It previously contained gas available after initial deductions (i.e. tx costs) - It will now contain the full tx gasLimit value Signed-off-by: jsvisa <delweng@gmail.com> * all: remove debug-field from vm config (#27048) This PR removes the Debug field from vmconfig, making it so that if a tracer is set, debug=true is implied. --------- Co-authored-by: 0xTylerHolmes <tyler@ethereum.org> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> * metrics: make gauge_float64 and counter_float64 lock free (#27025) Makes the float-gauges lock-free name old time/op new time/op delta CounterFloat64Parallel-8 1.45µs ±10% 0.85µs ± 6% -41.65% (p=0.008 n=5+5) --------- Co-authored-by: Exca-DK <dev@DESKTOP-RI45P4J.localdomain> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/tracers: use atomic type (#27031) Use the new atomic types in package eth/tracers --------- Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * build: upgrade -dlgo version to Go 1.20.3 * core/txpool: disallow future churn by remote txs (#26907) Prior to this change, it was possible that transactions are erroneously deemed as 'future' although they are in fact 'pending', causing them to be dropped due to 'future' not being allowed to replace 'pending'. This change fixes that, by doing a more in-depth inspection of the queue. * core, miner: drop transactions from the same sender when error occurs (#27038) This PR unifies the error handling in miner. Whenever an error occur while applying a transaction, the transaction should be regarded as invalid and all following transactions from the same sender not executable because of the nonce restriction. The only exception is the `nonceTooLow` error which is handled separately. * params: new sepolia bootnodes (#27099) New sepolia bootnodes managed by EF devops * cmd/devp2p: fix erroneous log output in crawler (#27089) cmd/devp2p: fix log of ignored recent nodes counter * signer/core: rename testdata files (#27063) Sets a meaningful name on test-files * core: fix comment to reflect function name (#27070) * params: remove `EIP150Hash` from chainconfig (#27087) The EIP150Hash was an idea where, after the fork, we hardcoded the forked hash as an extra defensive mechanism. It wasn't really used, since forks weren't contentious and for all the various testnets and private networks it's been a hassle to have around. This change removes that config field. --------- Signed-off-by: jsvisa <delweng@gmail.com> * p2p: access embedded fields of Server directly (#27078) * consensus/ethash: use atomic type (#27068) * cmd/devp2p: make crawler-route53-updater less verbose (#27116) Follow-up to #26697, makes the crawler less verbose on route53-based scenarios. It also changes the loglevel from debug to info on Updates, which are typically the root, and can be interesting to see. * cmd/geth: rename --vmodule to --log.vmodule (#27071) renames `--vmodule` to `--log.vmodule`, and prints a warning if the old form is used. * core/vm: order opcodes properly (#27113) * metrics: use atomic type (#27121) * all: refactor trie API (#26995) In this PR, all TryXXX(e.g. TryGet) APIs of trie are renamed to XXX(e.g. Get) with an error returned. The original XXX(e.g. Get) APIs are renamed to MustXXX(e.g. MustGet) and does not return any error -- they print a log output. A future PR will change the behaviour to panic on errorrs. * params: go-ethereum v1.11.6 stable * dev: chg: regression changes for bor after merge * dev: chg: more regression changes for bor after merge * dev: chg: txpool_test regression changes after merge * dev: chg: gomock re-generate mocks for backend interface * dev: chg: regression changes after develop is merged into upstream-merge * dev: chg: further fixes merging develop into upstream-merge * dev: chg: apply changes to NewParallelBlockChain * dev: chg: solve some TODOs * dev: fix: CreateConsensusEngine for new ethereum objects * dev: fix: NewParallelBlockChain using Genesis * dev: fix: build ci.go * dev: fix: thelper and tparallel lint * dev: fix: http related and nilnil lint errors * dev: fix: ineffassign lint errors * dev: chg: comment position fix * dev: fix: govet lint errors * dev: fix: error related lint issues * dev: fix: bodyclose lint issues * dev: fix: some wsl lint issues * dev: fix: more wsl lint issues * dev: fix: errorcheck lint issues * dev: fix: solve more lint issues * dev: fix: more wsl lint issues * dev: fix: more errcheck lint issues * dev: fix: most of wsl lint issues * dev: fix: all remaining lint issues * dev: fix: t.Parallel called multiple times * dev: fix: tests failing due to t.Parallel * fix : runtime testcases * fix : testcase : config, addTxWithChain, burnAmount * fix : ethhash bor burn contract * fix : genspec config * fix : freezer, TestStateProcessorErrors * core,eth,miner: fix initial test cases (#922) * fix : TestTransactionIndices, testBeaconSync * fix : TestBeaconSync66 * core,eth: fix TestDeduplication, TestSyncAccountPerformance, TestTraceTransaction * fix : TestTxIndexer * rm : multiple coinbase balance * fix : testCommitInterruptExperimentBor * adding balance send to burntcontract back * Fix header encoding test * core,eth/tracers: fix TestPrestateWithDiffModeTracer * consensus/bor,eth/filters,miner,params,tests: fix mocks * fix : TestGraphQLConcurrentResolvers * fix : TestBuildPayload * common,core,miner: fix goleaks,duplicate init and inconsistent mutex (un)locks * fix : lint * fix : lint * fix : test-integration * fix : test-integration * core: restore AddFeeTransferLog post miner tipping * fix : TestGraphQLConcurrentResolvers * fix : deadlocks * rm: t.parallel from testQueueTimeLimiting tests * Merge branch 'develop' into mardizzone/upstream-merge * fix : lint * fix : test-integration * fix : TxDependency * add rpc.enabledeprecatedpersonal flag --------- Signed-off-by: Sungwoo Kim <git@sung-woo.kim> Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Chris Ziogas <ziogaschr@gmail.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Patrick O'Grady <prohb125@gmail.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Jason Yuan <jason.yuan@curvegrid.com> Co-authored-by: Jason Yuan <jason.yuan869@gmail.com> Co-authored-by: Sungwoo Kim <git@sung-woo.kim> Co-authored-by: Yier <90763233+yierx@users.noreply.github.com> Co-authored-by: Catror <me@catror.com> Co-authored-by: Nate Armstrong <naterarmstrong@gmail.com> Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com> Co-authored-by: Peter (bitfly) <1674920+peterbitfly@users.noreply.github.com> Co-authored-by: PulsarAI <dev@pulsar-systems.fi> Co-authored-by: turboboost55 <7891737+turboboost55@users.noreply.github.com> Co-authored-by: Adrian Sutton <adrian@symphonious.net> Co-authored-by: Guruprasad Kamath <48196632+gurukamath@users.noreply.github.com> Co-authored-by: James Prestwich <10149425+prestwich@users.noreply.github.com> Co-authored-by: Daniel Fernandes <711733+daferna@users.noreply.github.com> Co-authored-by: Rafael Matias <rafael@skyle.net> Co-authored-by: xiyang <90125263+JBossBC@users.noreply.github.com> Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: panicalways <113693386+panicalways@users.noreply.github.com> Co-authored-by: dwn1998 <42262393+dwn1998@users.noreply.github.com> Co-authored-by: s7v7nislands <s7v7nislands@gmail.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Stephen Flynn <ssflynn@gmail.com> Co-authored-by: Stephen Flynn <stephen.flynn@gapac.com> Co-authored-by: Jonathan Otto <jonathan.otto@gmail.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com> Co-authored-by: ucwong <ethereum2k@gmail.com> Co-authored-by: norwnd <112318969+norwnd@users.noreply.github.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: Adrian Sutton <adrian@oplabs.co> Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com> Co-authored-by: openex <openexkevin@gmail.com> Co-authored-by: “openex27” <“openexkevin@gmail.com”> Co-authored-by: sudeep <sudeepdino008@gmail.com> Co-authored-by: joohhnnn <68833933+joohhnnn@users.noreply.github.com> Co-authored-by: 0xTylerHolmes <tyler@ethereum.org> Co-authored-by: Exca-DK <85954505+Exca-DK@users.noreply.github.com> Co-authored-by: Exca-DK <dev@DESKTOP-RI45P4J.localdomain> Co-authored-by: Marius Kjærstad <mkjaerstad@protonmail.com> Co-authored-by: Parithosh Jayanthi <parithosh@indenwolken.xyz> Co-authored-by: noel <72006780+0x00Duke@users.noreply.github.com> Co-authored-by: Taeguk Kwon <xornrbboy@gmail.com> Co-authored-by: Anusha <63559942+anusha-ctrl@users.noreply.github.com> Co-authored-by: Alex Beregszaszi <alex@rtfs.hu> Co-authored-by: Shivam Sharma <shivam691999@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com>
1940 lines
57 KiB
Go
1940 lines
57 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/v2"
|
|
lru "github.com/hashicorp/golang-lru"
|
|
"github.com/holiman/uint256"
|
|
"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/blockstm"
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/core/vm"
|
|
"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/rlp"
|
|
"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
|
|
)
|
|
|
|
var (
|
|
errBlockInterruptedByNewHead = errors.New("new head arrived while building block")
|
|
errBlockInterruptedByRecommit = errors.New("recommit interrupt while building block")
|
|
errBlockInterruptedByTimeout = errors.New("timeout while building block")
|
|
|
|
// metrics gauge to track total and empty blocks sealed by a miner
|
|
sealedBlocksCounter = metrics.NewRegisteredCounter("worker/sealedBlocks", nil)
|
|
sealedEmptyBlocksCounter = metrics.NewRegisteredCounter("worker/sealedEmptyBlocks", nil)
|
|
txCommitInterruptCounter = metrics.NewRegisteredCounter("worker/txCommitInterrupt", 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[common.Hash] // ancestor set (used for checking uncle parent validity)
|
|
family mapset.Set[common.Hash] // 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
|
|
commitInterruptTimeout
|
|
)
|
|
|
|
// newWorkReq represents a request for new sealing work submitting with relative interrupt notifier.
|
|
type newWorkReq struct {
|
|
//nolint:containedctx
|
|
ctx context.Context
|
|
interrupt *atomic.Int32
|
|
noempty bool
|
|
timestamp int64
|
|
}
|
|
|
|
// newPayloadResult represents a result struct corresponds to payload generation.
|
|
type newPayloadResult struct {
|
|
err error
|
|
block *types.Block
|
|
fees *big.Int
|
|
}
|
|
|
|
// getWorkReq represents a request for getting a new sealing work with provided parameters.
|
|
type getWorkReq struct {
|
|
//nolint:containedctx
|
|
ctx context.Context
|
|
params *generateParams
|
|
result chan *newPayloadResult // non-blocking channel
|
|
}
|
|
|
|
// 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
|
|
|
|
// 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 atomic.Bool // The indicator whether the consensus engine is running or not.
|
|
newTxs atomic.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 atomic.Bool
|
|
|
|
// newpayloadTimeout is the maximum timeout allowance for creating payload.
|
|
// The default value is 2 seconds but node operator can set it to arbitrary
|
|
// large value. A large timeout allowance may cause Geth to fail creating
|
|
// a non-empty payload within the specified time and eventually miss the slot
|
|
// in case there are some computation expensive transactions in txpool.
|
|
newpayloadTimeout time.Duration
|
|
|
|
// recommit is the time interval to re-create sealing work or to re-build
|
|
// payload in proof-of-stake stage.
|
|
recommit time.Duration
|
|
|
|
// 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
|
|
interruptCommitFlag bool // Interrupt commit ( Default true )
|
|
interruptedTxCache *vm.TxCache
|
|
}
|
|
|
|
//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,
|
|
chain: eth.BlockChain(),
|
|
mux: mux,
|
|
isLocalBlock: isLocalBlock,
|
|
localUncles: make(map[common.Hash]*types.Block),
|
|
remoteUncles: make(map[common.Hash]*types.Block),
|
|
unconfirmed: newUnconfirmedBlocks(eth.BlockChain(), sealingLogAtDepth),
|
|
coinbase: config.Etherbase,
|
|
extra: config.ExtraData,
|
|
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),
|
|
startCh: make(chan struct{}, 1),
|
|
exitCh: make(chan struct{}),
|
|
resubmitIntervalCh: make(chan time.Duration),
|
|
resubmitAdjustCh: make(chan *intervalAdjust, resubmitAdjustChanSize),
|
|
interruptCommitFlag: config.CommitInterruptFlag,
|
|
}
|
|
worker.noempty.Store(true)
|
|
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)
|
|
|
|
interruptedTxCache, err := lru.New(vm.InterruptedTxCacheSize)
|
|
if err != nil {
|
|
log.Warn("Failed to create interrupted tx cache", "err", err)
|
|
}
|
|
|
|
worker.interruptedTxCache = &vm.TxCache{
|
|
Cache: interruptedTxCache,
|
|
}
|
|
|
|
if !worker.interruptCommitFlag {
|
|
worker.noempty.Store(false)
|
|
}
|
|
|
|
// 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
|
|
}
|
|
|
|
worker.recommit = recommit
|
|
|
|
// Sanitize the timeout config for creating payload.
|
|
newpayloadTimeout := worker.config.NewPayloadTimeout
|
|
if newpayloadTimeout == 0 {
|
|
log.Warn("Sanitizing new payload timeout to default", "provided", newpayloadTimeout, "updated", DefaultConfig.NewPayloadTimeout)
|
|
newpayloadTimeout = DefaultConfig.NewPayloadTimeout
|
|
}
|
|
|
|
if newpayloadTimeout < time.Millisecond*100 {
|
|
log.Warn("Low payload timeout may cause high amount of non-full blocks", "provided", newpayloadTimeout, "default", DefaultConfig.NewPayloadTimeout)
|
|
}
|
|
|
|
worker.newpayloadTimeout = newpayloadTimeout
|
|
|
|
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
|
|
}
|
|
|
|
// etherbase retrieves the configured etherbase address.
|
|
func (w *worker) etherbase() common.Address {
|
|
w.mu.RLock()
|
|
defer w.mu.RUnlock()
|
|
|
|
return w.coinbase
|
|
}
|
|
|
|
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() {
|
|
w.noempty.Store(true)
|
|
}
|
|
|
|
// enablePreseal enables pre-sealing feature
|
|
func (w *worker) enablePreseal() {
|
|
w.noempty.Store(false)
|
|
}
|
|
|
|
// 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() {
|
|
w.running.Store(true)
|
|
w.startCh <- struct{}{}
|
|
}
|
|
|
|
// stop sets the running status as 0.
|
|
func (w *worker) stop() {
|
|
w.running.Store(false)
|
|
}
|
|
|
|
// isRunning returns an indicator whether worker is running or not.
|
|
func (w *worker) isRunning() bool {
|
|
return w.running.Load()
|
|
}
|
|
|
|
// close terminates all background threads maintained by the worker.
|
|
// Note the worker does not support being closed multiple times.
|
|
func (w *worker) close() {
|
|
w.running.Store(false)
|
|
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
|
|
// }
|
|
//}
|
|
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 *atomic.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 {
|
|
interrupt.Store(s)
|
|
}
|
|
|
|
interrupt = new(atomic.Int32)
|
|
select {
|
|
case w.newWorkCh <- &newWorkReq{interrupt: interrupt, noempty: noempty, timestamp: timestamp, ctx: ctx}:
|
|
case <-w.exitCh:
|
|
return
|
|
}
|
|
timer.Reset(recommit)
|
|
w.newTxs.Store(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().Number.Uint64())
|
|
|
|
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 w.newTxs.Load() == 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, contextcheck
|
|
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:
|
|
block, fees, err := w.generateWork(req.ctx, req.params)
|
|
req.result <- &newPayloadResult{
|
|
err: err,
|
|
block: block,
|
|
fees: fees,
|
|
}
|
|
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 mining block contains less than 2 uncle blocks,
|
|
// add the new uncle block if valid and regenerate a mining block.
|
|
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.Number.Uint64() {
|
|
delete(w.localUncles, hash)
|
|
}
|
|
}
|
|
|
|
for hash, uncle := range w.remoteUncles {
|
|
if uncle.NumberU64()+staleThreshold <= chainHead.Number.Uint64() {
|
|
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)
|
|
}
|
|
|
|
var baseFee *uint256.Int
|
|
if w.current.header.BaseFee != nil {
|
|
baseFee = cmath.FromBig(w.current.header.BaseFee)
|
|
}
|
|
|
|
txset := types.NewTransactionsByPriceAndNonce(w.current.signer, txs, baseFee)
|
|
tcount := w.current.tcount
|
|
|
|
//nolint:contextcheck
|
|
w.commitTransactions(w.current, txset, nil, context.Background())
|
|
|
|
// Only update the snapshot if any new transactons 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())
|
|
}
|
|
}
|
|
|
|
w.newTxs.Add(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.Header, 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 {
|
|
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[common.Hash](),
|
|
family: mapset.NewSet[common.Hash](),
|
|
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, interruptCtx context.Context) ([]*types.Log, error) {
|
|
var (
|
|
snap = env.state.Snapshot()
|
|
gp = env.gasPool.Gas()
|
|
)
|
|
|
|
// nolint : staticcheck
|
|
interruptCtx = vm.SetCurrentTxOnContext(interruptCtx, tx.Hash())
|
|
|
|
receipt, err := core.ApplyTransaction(w.chainConfig, w.chain, &env.coinbase, env.gasPool, env.state, env.header, tx, &env.header.GasUsed, *w.chain.GetVMConfig(), interruptCtx)
|
|
if err != nil {
|
|
env.state.RevertToSnapshot(snap)
|
|
env.gasPool.SetGas(gp)
|
|
|
|
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 *atomic.Int32, interruptCtx context.Context) error {
|
|
gasLimit := env.header.GasLimit
|
|
if env.gasPool == nil {
|
|
env.gasPool = new(core.GasPool).AddGas(gasLimit)
|
|
}
|
|
|
|
var coalescedLogs []*types.Log
|
|
|
|
var depsMVReadList [][]blockstm.ReadDescriptor
|
|
|
|
var depsMVFullWriteList [][]blockstm.WriteDescriptor
|
|
|
|
var mvReadMapList []map[blockstm.Key]blockstm.ReadDescriptor
|
|
|
|
var deps map[int]map[int]bool
|
|
|
|
chDeps := make(chan blockstm.TxDep)
|
|
|
|
var count int
|
|
|
|
var depsWg sync.WaitGroup
|
|
|
|
EnableMVHashMap := false
|
|
|
|
// create and add empty mvHashMap in statedb
|
|
if EnableMVHashMap {
|
|
depsMVReadList = [][]blockstm.ReadDescriptor{}
|
|
|
|
depsMVFullWriteList = [][]blockstm.WriteDescriptor{}
|
|
|
|
mvReadMapList = []map[blockstm.Key]blockstm.ReadDescriptor{}
|
|
|
|
deps = map[int]map[int]bool{}
|
|
|
|
chDeps = make(chan blockstm.TxDep)
|
|
|
|
count = 0
|
|
|
|
depsWg.Add(1)
|
|
|
|
go func(chDeps chan blockstm.TxDep) {
|
|
for t := range chDeps {
|
|
deps = blockstm.UpdateDeps(deps, t)
|
|
}
|
|
|
|
depsWg.Done()
|
|
}(chDeps)
|
|
}
|
|
|
|
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 {
|
|
if interruptCtx != nil {
|
|
if EnableMVHashMap {
|
|
env.state.AddEmptyMVHashMap()
|
|
}
|
|
|
|
// case of interrupting by timeout
|
|
select {
|
|
case <-interruptCtx.Done():
|
|
txCommitInterruptCounter.Inc(1)
|
|
log.Warn("Tx Level Interrupt")
|
|
break mainloop
|
|
default:
|
|
}
|
|
}
|
|
|
|
// Check interruption signal and abort building if it's fired.
|
|
if interrupt != nil {
|
|
if signal := interrupt.Load(); signal != commitInterruptNone {
|
|
breakCause = "interrupt"
|
|
return signalToErr(signal)
|
|
}
|
|
}
|
|
// If we don't have enough gas for any further transactions then we're done.
|
|
if env.gasPool.Gas() < params.TxGas {
|
|
breakCause = "Not enough gas for further transactions"
|
|
log.Trace("Not enough gas for further transactions", "have", env.gasPool, "want", params.TxGas)
|
|
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.
|
|
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.SetTxContext(tx.Hash(), env.tcount)
|
|
|
|
var start time.Time
|
|
|
|
log.OnDebug(func(log.Logging) {
|
|
start = time.Now()
|
|
})
|
|
|
|
logs, err := w.commitTransaction(env, tx, interruptCtx)
|
|
|
|
switch {
|
|
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, nil):
|
|
// Everything ok, collect the logs and shift in the next transaction from the same account
|
|
coalescedLogs = append(coalescedLogs, logs...)
|
|
env.tcount++
|
|
|
|
if EnableMVHashMap {
|
|
depsMVReadList = append(depsMVReadList, env.state.MVReadList())
|
|
depsMVFullWriteList = append(depsMVFullWriteList, env.state.MVFullWriteList())
|
|
mvReadMapList = append(mvReadMapList, env.state.MVReadMap())
|
|
|
|
temp := blockstm.TxDep{
|
|
Index: env.tcount - 1,
|
|
ReadList: depsMVReadList[count],
|
|
FullWriteList: depsMVFullWriteList,
|
|
}
|
|
|
|
chDeps <- temp
|
|
count++
|
|
}
|
|
|
|
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))
|
|
})
|
|
|
|
default:
|
|
// Transaction is regarded as invalid, drop all consecutive transactions from
|
|
// the same sender because of `nonce-too-high` clause.
|
|
log.Debug("Transaction failed, account skipped", "hash", tx.Hash(), "err", err)
|
|
txs.Pop()
|
|
}
|
|
|
|
if EnableMVHashMap {
|
|
env.state.ClearReadMap()
|
|
env.state.ClearWriteMap()
|
|
}
|
|
}
|
|
|
|
// nolint:nestif
|
|
if EnableMVHashMap && w.isRunning() {
|
|
close(chDeps)
|
|
depsWg.Wait()
|
|
|
|
var blockExtraData types.BlockExtraData
|
|
|
|
tempVanity := env.header.Extra[:types.ExtraVanityLength]
|
|
tempSeal := env.header.Extra[len(env.header.Extra)-types.ExtraSealLength:]
|
|
|
|
if len(mvReadMapList) > 0 {
|
|
tempDeps := make([][]uint64, len(mvReadMapList))
|
|
|
|
for j := range deps[0] {
|
|
tempDeps[0] = append(tempDeps[0], uint64(j))
|
|
}
|
|
|
|
delayFlag := true
|
|
|
|
for i := 1; i <= len(mvReadMapList)-1; i++ {
|
|
reads := mvReadMapList[i-1]
|
|
|
|
_, ok1 := reads[blockstm.NewSubpathKey(env.coinbase, state.BalancePath)]
|
|
_, ok2 := reads[blockstm.NewSubpathKey(common.HexToAddress(w.chainConfig.Bor.CalculateBurntContract(env.header.Number.Uint64())), state.BalancePath)]
|
|
|
|
if ok1 || ok2 {
|
|
delayFlag = false
|
|
}
|
|
|
|
for j := range deps[i] {
|
|
tempDeps[i] = append(tempDeps[i], uint64(j))
|
|
}
|
|
}
|
|
|
|
if err := rlp.DecodeBytes(env.header.Extra[types.ExtraVanityLength:len(env.header.Extra)-types.ExtraSealLength], &blockExtraData); err != nil {
|
|
log.Error("error while decoding block extra data", "err", err)
|
|
return err
|
|
}
|
|
|
|
if delayFlag {
|
|
blockExtraData.TxDependency = tempDeps
|
|
} else {
|
|
blockExtraData.TxDependency = nil
|
|
}
|
|
} else {
|
|
blockExtraData.TxDependency = nil
|
|
}
|
|
|
|
blockExtraDataBytes, err := rlp.EncodeToBytes(blockExtraData)
|
|
if err != nil {
|
|
log.Error("error while encoding block extra data: %v", err)
|
|
return err
|
|
}
|
|
|
|
env.header.Extra = []byte{}
|
|
|
|
env.header.Extra = append(tempVanity, blockExtraDataBytes...)
|
|
|
|
env.header.Extra = append(env.header.Extra, tempSeal...)
|
|
|
|
}
|
|
|
|
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)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// 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
|
|
withdrawals types.Withdrawals // List of withdrawals to include in block.
|
|
noUncle bool // Flag whether the uncle block inclusion is allowed
|
|
noTxs bool // Flag whether an empty block without any transaction is expected
|
|
}
|
|
|
|
// 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{}) {
|
|
block := w.chain.GetBlockByHash(genParams.parentHash)
|
|
if block == nil {
|
|
return nil, fmt.Errorf("missing parent")
|
|
}
|
|
|
|
parent = block.Header()
|
|
}
|
|
// 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.
|
|
header := &types.Header{
|
|
ParentHash: parent.Hash(),
|
|
Number: new(big.Int).Add(parent.Number, common.Big1),
|
|
GasLimit: core.CalcGasLimit(parent.GasLimit, w.config.GasCeil),
|
|
Time: timestamp,
|
|
Coinbase: genParams.coinbase,
|
|
}
|
|
// Set the extra field.
|
|
if 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).ToBig()
|
|
|
|
if !w.chainConfig.IsLondon(parent.Number) {
|
|
parentGasLimit := parent.GasLimit * w.chainConfig.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 *atomic.Int32, env *environment, interruptCtx context.Context) error {
|
|
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.
|
|
pending := w.eth.TxPool().Pending(ctx, true)
|
|
localTxs, remoteTxs := make(map[common.Address]types.Transactions), pending
|
|
|
|
var (
|
|
localTxsCount int
|
|
remoteTxsCount int
|
|
)
|
|
|
|
// 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()
|
|
|
|
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
|
|
err error
|
|
)
|
|
|
|
if len(localTxs) > 0 {
|
|
var txs *types.TransactionsByPriceAndNonce
|
|
|
|
tracing.Exec(ctx, "", "worker.LocalTransactionsByPriceAndNonce", func(ctx context.Context, span trace.Span) {
|
|
var baseFee *uint256.Int
|
|
if env.header.BaseFee != nil {
|
|
baseFee = cmath.FromBig(env.header.BaseFee)
|
|
}
|
|
|
|
txs = types.NewTransactionsByPriceAndNonce(env.signer, localTxs, 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) {
|
|
err = w.commitTransactions(env, txs, interrupt, interruptCtx)
|
|
})
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
localEnvTCount = env.tcount
|
|
}
|
|
|
|
if len(remoteTxs) > 0 {
|
|
var txs *types.TransactionsByPriceAndNonce
|
|
|
|
tracing.Exec(ctx, "", "worker.RemoteTransactionsByPriceAndNonce", func(ctx context.Context, span trace.Span) {
|
|
var baseFee *uint256.Int
|
|
if env.header.BaseFee != nil {
|
|
baseFee = cmath.FromBig(env.header.BaseFee)
|
|
}
|
|
|
|
txs = types.NewTransactionsByPriceAndNonce(env.signer, remoteTxs, 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) {
|
|
err = w.commitTransactions(env, txs, interrupt, interruptCtx)
|
|
})
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
remoteEnvTCount = env.tcount
|
|
}
|
|
|
|
tracing.SetAttributes(
|
|
span,
|
|
attribute.Int("len of final local txs ", localEnvTCount),
|
|
attribute.Int("len of final remote txs", remoteEnvTCount),
|
|
)
|
|
|
|
return nil
|
|
}
|
|
|
|
// generateWork generates a sealing block based on the given parameters.
|
|
func (w *worker) generateWork(ctx context.Context, params *generateParams) (*types.Block, *big.Int, error) {
|
|
work, err := w.prepareWork(params)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
defer work.discard()
|
|
|
|
// nolint : contextcheck
|
|
var interruptCtx = context.Background()
|
|
|
|
if !params.noTxs {
|
|
interrupt := new(atomic.Int32)
|
|
|
|
timer := time.AfterFunc(w.newpayloadTimeout, func() {
|
|
interrupt.Store(commitInterruptTimeout)
|
|
})
|
|
defer timer.Stop()
|
|
|
|
err := w.fillTransactions(ctx, interrupt, work, interruptCtx)
|
|
if errors.Is(err, errBlockInterruptedByTimeout) {
|
|
log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(w.newpayloadTimeout))
|
|
}
|
|
}
|
|
|
|
block, err := w.engine.FinalizeAndAssemble(ctx, w.chain, work.header, work.state, work.txs, work.unclelist(), work.receipts, params.withdrawals)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
return block, totalFees(block, work.receipts), nil
|
|
}
|
|
|
|
// 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 *atomic.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() {
|
|
coinbase = w.etherbase()
|
|
if coinbase == (common.Address{}) {
|
|
log.Error("Refusing to mine without etherbase")
|
|
return
|
|
}
|
|
}
|
|
|
|
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 && w.interruptCommitFlag {
|
|
block := w.chain.GetBlockByHash(w.chain.CurrentBlock().Hash())
|
|
interruptCtx, stopFn = getInterruptTimer(ctx, work, block)
|
|
// nolint : staticcheck
|
|
interruptCtx = vm.PutCache(interruptCtx, w.interruptedTxCache)
|
|
}
|
|
|
|
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 && !w.noempty.Load() {
|
|
_ = w.commit(ctx, work.copy(), nil, false, start)
|
|
}
|
|
// Fill pending transactions from the txpool into the block.
|
|
err = w.fillTransactions(ctx, interrupt, work, interruptCtx)
|
|
|
|
switch {
|
|
case err == nil:
|
|
// The entire block is filled, decrease resubmit interval in case
|
|
// of current interval is larger than the user-specified one.
|
|
w.resubmitAdjustCh <- &intervalAdjust{inc: false}
|
|
|
|
case errors.Is(err, errBlockInterruptedByRecommit):
|
|
// Notify resubmit loop to increase resubmitting interval if the
|
|
// interruption is due to frequent commits.
|
|
gaslimit := work.header.GasLimit
|
|
|
|
ratio := float64(gaslimit-work.gasPool.Gas()) / float64(gaslimit)
|
|
if ratio < 0.1 {
|
|
ratio = 0.1
|
|
}
|
|
w.resubmitAdjustCh <- &intervalAdjust{
|
|
ratio: ratio,
|
|
inc: true,
|
|
}
|
|
|
|
case errors.Is(err, errBlockInterruptedByNewHead):
|
|
// If the block building is interrupted by newhead event, discard it
|
|
// totally. Committing the interrupted block introduces unnecessary
|
|
// delay, and possibly causes miner to mine on the previous head,
|
|
// which could result in higher uncle rate.
|
|
work.discard()
|
|
return
|
|
}
|
|
// Submit the generated block for consensus sealing.
|
|
_ = w.commit(ctx, work.copy(), w.fullTaskHook, true, start)
|
|
|
|
// 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()
|
|
// Withdrawals are set to nil here, because this is only called in PoW.
|
|
block, err := w.engine.FinalizeAndAssemble(ctx, w.chain, env.header, env.state, env.txs, env.unclelist(), env.receipts, nil)
|
|
|
|
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)
|
|
|
|
fees := totalFees(block, env.receipts)
|
|
feesInEther := new(big.Float).Quo(new(big.Float).SetInt(fees), big.NewFloat(params.Ether))
|
|
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", feesInEther,
|
|
"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.
|
|
// The generation result will be passed back via the given channel no matter
|
|
// the generation itself succeeds or not.
|
|
func (w *worker) getSealingBlock(parent common.Hash, timestamp uint64, coinbase common.Address, random common.Hash, withdrawals types.Withdrawals, noTxs bool) (*types.Block, *big.Int, error) {
|
|
ctx := tracing.WithTracer(context.Background(), otel.GetTracerProvider().Tracer("getSealingBlock"))
|
|
|
|
req := &getWorkReq{
|
|
params: &generateParams{
|
|
timestamp: timestamp,
|
|
forceTime: true,
|
|
parentHash: parent,
|
|
coinbase: coinbase,
|
|
random: random,
|
|
withdrawals: withdrawals,
|
|
noUncle: true,
|
|
noTxs: noTxs,
|
|
},
|
|
result: make(chan *newPayloadResult, 1),
|
|
ctx: ctx,
|
|
}
|
|
select {
|
|
case w.getWorkCh <- req:
|
|
result := <-req.result
|
|
if result.err != nil {
|
|
return nil, nil, result.err
|
|
}
|
|
|
|
return result.block, result.fees, nil
|
|
case <-w.exitCh:
|
|
return nil, 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 Wei. Block transactions and receipts have to have the same order.
|
|
func totalFees(block *types.Block, receipts []*types.Receipt) *big.Int {
|
|
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 feesWei
|
|
}
|
|
|
|
// signalToErr converts the interruption signal to a concrete error type for return.
|
|
// The given signal must be a valid interruption signal.
|
|
func signalToErr(signal int32) error {
|
|
switch signal {
|
|
case commitInterruptNewHead:
|
|
return errBlockInterruptedByNewHead
|
|
case commitInterruptResubmit:
|
|
return errBlockInterruptedByRecommit
|
|
case commitInterruptTimeout:
|
|
return errBlockInterruptedByTimeout
|
|
default:
|
|
panic(fmt.Errorf("undefined signal %d", signal))
|
|
}
|
|
}
|