mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-01 17:43:45 +00:00
* accounts/usbwallet: support dynamic tx (#30180) Adds support non-legacy transaction-signing using ledger --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * signer/core: extended support for EIP-712 array types (#30620) This change updates the EIP-712 implementation to resolve [#30619](https://github.com/ethereum/go-ethereum/issues/30619). The test cases have been repurposed from the ethers.js [repository](https://github.com/ethers-io/ethers.js/blob/main/testcases/typed-data.json.gz), but have been updated to remove tests that don't have a valid domain separator; EIP-712 messages without a domain separator are not supported by geth. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd/evm: benchmarking via `statetest` command + filter by name, index and fork (#30442) When `evm statetest --bench` is specified, benchmark the execution similarly to `evm run`. Also adds the ability to filter tests by name, index and fork. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * beacon/blsync: remove cli dependencies (#30720) This PR moves chain config related code (config file processing, fork logic, network defaults) from `beacon/types` and `beacon/blsync` into `beacon/params` while the command line flag logic of the chain config is moved into `cmd/utils`, thereby removing the cli dependencies from package `beacon` and its sub-packages. * core/state: invoke OnCodeChange-hook on selfdestruct (#30686) This change invokes the OnCodeChange hook when selfdestruct operation is performed, and a contract is removed. This is an event which can be consumed by tracers. * trie/utils: remove unneeded initialization (#30472) * travis: build and upload RISC-V docker images too (#30739) Requested by @barnabasbusa * core/state, triedb/database: refactor state reader (#30712) Co-authored-by: Martin HS <martin@swende.se> * eth/protocols/eth: add ETH68 protocol handler fuzzers (#30417) Adds a protocol handler fuzzer to fuzz the ETH68 protocol handlers * tests: fix test panic (#30741) Fix panic in tests * p2p/netutil: unittests for addrutil (#30439) add unit tests for `p2p/addrutil` --------- Co-authored-by: Martin HS <martin@swende.se> * docs: fix typo (#30740) fixes a typo on one of the postmortems * core/state: tests on the binary iterator (#30754) Fixes an error in the binary iterator, adds additional testcases --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/geth: remove unlock commandline flag (#30737) This is one further step towards removing account management from `geth`. This PR deprecates the flag `unlock`, and makes the flag moot: unlock via geth is no longer possible. * build: upgrade -dlgo version to Go 1.23.3 (#30742) New release: https://groups.google.com/g/golang-announce/c/X5KodEJYuqI * core: fix typos (#30767) * all: remove kilic dependency from bls12381 fuzzers (#30296) The [kilic](https://github.com/kilic/bls12-381) bls12381 implementation has been archived. It shouldn't be necessary to include it as a fuzzing target any longer. This also adds fuzzers for G1/G2 mul that use inputs that are guaranteed to be valid. Previously, we just did random input fuzzing for these precompiles. * core/txpool, eth/catalyst: clear transaction pool in Rollback (#30534) This adds an API method `DropTransactions` to legacy pool, blob pool and txpool interface. This method removes all txs currently tracked in the pools. It modifies the simulated beacon to use the new method in `Rollback` which removes previous hacky implementation that also erroneously reset the gas tip to 1 gwei. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * rpc: run tests in parallel (#30384) Continuation of https://github.com/ethereum/go-ethereum/pull/30381 * version: go-ethereum v1.14.12 stable * version: begin v1.14.13 release cycle * version: fix typo in v1.14.13 release cycle name * core/vm/program: evm bytecode-building utility (#30725) In many cases, there is a need to create somewhat nontrivial bytecode. A recent example is the verkle statetests, where we want a `CREATE2`- op to create a contract, which can then be invoked, and when invoked does a selfdestruct-to-self. It is overkill to go full solidity, but it is also a bit tricky do assemble this by concatenating bytes. This PR takes an approach that has been used in in goevmlab for several years. Using this utility, the case can be expressed as: ```golang // Some runtime code runtime := program.New().Ops(vm.ADDRESS, vm.SELFDESTRUCT).Bytecode() // A constructor returning the runtime code initcode := program.New().ReturnData(runtime).Bytecode() // A factory invoking the constructor outer := program.New().Create2AndCall(initcode, nil).Bytecode() ``` We have a lot of places in the codebase where we concatenate bytes, cast from `vm.OpCode` . By taking tihs approach instead, thos places can be made a bit more maintainable/robust. * core, eth, internal, cmd: rework EVM constructor (#30745) This pull request refactors the EVM constructor by removing the TxContext parameter. The EVM object is frequently overused. Ideally, only a single EVM instance should be created and reused throughout the entire state transition of a block, with the transaction context switched as needed by calling evm.SetTxContext. Unfortunately, in some parts of the code, the EVM object is repeatedly created, resulting in unnecessary complexity. This pull request is the first step towards gradually improving and simplifying this setup. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * core, eth, internal, miner: remove unnecessary parameters (#30776) Follow-up to #30745 , this change removes some unnecessary parameters. * internal/ethapi: remove double map-clone (#30788) `ActivePrecompiledContracts()` clones the precompiled contract map, thus its callsite does not need to clone it * all: typos in comments (#30779) fixes some typos * trie: replace custom logic with bytes.HasPrefix (#30771) in `trie` - Replace custom logic with `bytes.HasPrefix` - Remove unnecessary code in `GetNode` * core, triedb: remove destruct flag in state snapshot (#30752) This pull request removes the destruct flag from the state snapshot to simplify the code. Previously, this flag indicated that an account was removed during a state transition, making all associated storage slots inaccessible. Because storage deletion can involve a large number of slots, the actual deletion is deferred until the end of the process, where it is handled in batches. With the deprecation of self-destruct in the Cancun fork, storage deletions are no longer expected. Historically, the largest storage deletion event in Ethereum was around 15 megabytes—manageable in memory. In this pull request, the single destruct flag is replaced by a set of deletion markers for individual storage slots. Each deleted storage slot will now appear in the Storage set with a nil value. This change will simplify a lot logics, such as storage accessing, storage flushing, storage iteration and so on. * internal/flags: fix "flag redefined" bug for alias on custom flags (#30796) This change fixes a bug on the `DirectoryFlag` and the `BigFlag`, which would trigger a `panic` with the message "flag redefined" in case an alias was added to such a flag. * eth/tracers/logger: fix json-logger output missing (#30804) Fixes a flaw introduced in https://github.com/ethereum/go-ethereum/pull/29795 , discovered while reviewing https://github.com/ethereum/go-ethereum/pull/30633 . * eth/tracers/logger: improve markdown logger (#30805) This PR improves the output of the markdown logger a bit. - Remove `RStack` field, - Move `Stack` last, since it may have very large vertical expansion - Make the pre- and post-exec metadata structured into a bullet-list * internal/ethapi: remove double map-clone (#30803) Similar to https://github.com/ethereum/go-ethereum/pull/30788 * accounts/abi: fix MakeTopics mutation of big.Int inputs (#30785) #28764 updated `func MakeTopics` to support negative `*big.Int`s. However, it also changed the behavior of the function from just _reading_ the input `*big.Int` via `Bytes()`, to leveraging `big.U256Bytes` which is documented as being _destructive_: This change updates `MakeTopics` to not mutate the original, and also applies the same change in signer/core/apitypes. * core/state/snapshot: simplify snapshot rebuild (#30772) This PR is purely for improved readability; I was doing work involving the file and think this may help others who are trying to understand what's going on. 1. `snapshot.Tree.Rebuild()` now returns a function that blocks until regeneration is complete, allowing `Tree.waitBuild()` to be removed entirely as all it did was search for the `done` channel behind this new function. 2. Its usage inside `New()` is also simplified by (a) only waiting if `!AsyncBuild`; and (b) avoiding the double negative of `if !NoBuild`. --------- Co-authored-by: Martin HS <martin@swende.se> * eth/ethconfig: improve error message if TTD missing (#30807) This updates the message you get when trying to initialize Geth with genesis.json that doesn't have `terminalTotalDifficulty`. The previous message was a bit obscure, I had to check the code to find out what the problem was. * core/tracing: add GetCodeHash to StateDB (#30784) This PR extends the tracing.StateDB interface by adding a GetCodeHash function. * Revert "core/state/snapshot: simplify snapshot rebuild (#30772)" (#30810) This reverts commit23800122b3. The original pull request introduces a bug and some flaky tests are detected because of this flaw. ``` --- FAIL: TestRecoverSnapshotFromWipingCrash (0.27s) blockchain_snapshot_test.go:158: The disk layer is not integrated snapshot is not constructed {"pc":0,"op":88,"gas":"0x7148","gasCost":"0x2","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PC"} {"pc":1,"op":255,"gas":"0x7146","gasCost":"0x1db0","memSize":0,"stack":["0x0"],"depth":1,"refund":0,"opName":"SELFDESTRUCT"} {"output":"","gasUsed":"0x0"} {"output":"","gasUsed":"0x1db2"} {"pc":0,"op":116,"gas":"0x13498","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH21"} ``` Before the original PR, the snapshot would block the function until the disk layer was fully generated under the following conditions: (a) explicitly required by users with `AsyncBuild = false`. (b) the snapshot was being fully rebuilt or *the disk layer generation had resumed*. Unfortunately, with the changes introduced in that PR, the snapshot no longer waits for disk layer generation to complete if the generation is resumed. It brings lots of uncertainty and breaks this tiny debug feature. * cmd/evm: don't reuse state between iterations, show errors (#30780) Reusing state between benchmark iterations resulted in inconsistent results across runs, which surfaced in https://github.com/ethereum/go-ethereum/issues/30778 . If these errors are triggered again, they will now trigger panic. --------- Co-authored-by: Martin HS <martin@swende.se> * core: better document reason for dropping error on return (#30811) Add a comment for error return of nil Signed-off-by: wangjingcun <wangjingcun@aliyun.com> * core/state/snapshot: handle legacy journal (#30802) This workaround is meant to minimize the possibility for snapshot generation once the geth node upgrades to new version (specifically #30752 ) In #30752, the journal format in state snapshot is modified by removing the destruct set. Therefore, the existing old format (version = 0) will be discarded and all in-memory layers will be lost. Unfortunately, the lost in-memory layers can't be recovered by some other approaches, and the entire state snapshot will be regenerated (it will last about 2.5 hours). This pull request introduces a workaround to adopt the legacy journal if the destruct set contained is empty. Since self-destruction has been deprecated following the cancun fork, the destruct set is expected to be nil for layers above the fork block. However, an exception occurs during contract deployment: pre-funded accounts may self-destruct, causing accounts with non-zero balances to be removed from the state. For example, https://etherscan.io/tx/0xa087333d83f0cd63b96bdafb686462e1622ce25f40bd499e03efb1051f31fe49). For nodes with a fully synced state, the legacy journal is likely compatible with the updated definition, eliminating the need for regeneration. Unfortunately, nodes performing a full sync of historical chain segments or encountering pre-funded account deletions may face incompatibilities, leading to automatic snapshot regeneration. * trie: combine validation loops in VerifyRangeProof (#30823) Small optimization. It's guaranteed that `len(keys)` == `len(values)`, so we can combine the checks in a single loop rather than 2 separate loops. * all: exclude empty outputs in requests commitment (#30670) Implements changes from these spec PRs: - https://github.com/ethereum/EIPs/pull/8989 - https://github.com/ethereum/execution-apis/pull/599 * cmd/bootnode: remove bootnode utility (#30813) Since we don't really support custom networks anymore, we don't need the bootnode utility. In case a discovery-only node is wanted, it can still be run using cmd/devp2p. * core/types: add length check in CalcRequestsHash (#30829) The existing implementation is correct when building and verifying blocks, since we will only collect non-empty requests into the block requests list. But it isn't correct for cases where a requests list containing empty items is sent by the consensus layer on the engine API. We want to ensure that empty requests do not cause a difference in validation there, so the commitment computation should explicitly skip them. * triedb/pathdb: track flat state changes in pathdb (snapshot integration pt 2) (#30643) This pull request ports some changes from the main state snapshot integration one, specifically introducing the flat state tracking in pathdb. Note, the tracked flat state changes are only held in memory and won't be persisted in the disk. Meanwhile, the correspoding state retrieval in persistent state is also not supported yet. The states management in disk is more complicated and will be implemented in a separate pull request. Part 1: https://github.com/ethereum/go-ethereum/pull/30752 * core/state: introduce code reader interface (#30816) This PR introduces a `ContractCodeReader` interface with functions defined: type ContractCodeReader interface { Code(addr common.Address, codeHash common.Hash) ([]byte, error) CodeSize(addr common.Address, codeHash common.Hash) (int, error) } This interface can be implemented in various ways. Although the codebase currently includes only one implementation, additional implementations could be created for different purposes and scenarios, such as a code reader designed for the Verkle tree approach or one that reads code from the witness. *Notably, this interface modifies the function’s semantics. If the contract code is not found, no error will be returned. An error should only be returned in the event of an unexpected issue, primarily for future implementations.* The original state.Reader interface is extended with ContractCodeReader methods, it gives us more flexibility to manipulate the reader with additional logic on top, e.g. Hooks. type Reader interface { ContractCodeReader StateReader } --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core: switch EVM tx context in ApplyMessage (#30809) This change relocates the EVM tx context switching to the ApplyMessage function. With this change, we can remove a lot of EVM.SetTxContext calls before message execution. ### Tracing API changes - This PR replaces the `GasPrice` field of the `VMContext` struct with `BaseFee`. Users may instead take the effective gas price from `tx.EffectiveGasTipValue(env.BaseFee)`. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * eth/tracers: fix state hooks in API (#30830) When a tx/block was being traced through the API the state hooks weren't being called as they should. This is due to #30745 moving the hooked statedb one level up in the state processor. This PR fixes that. --------- Co-authored-by: Martin HS <martin@swende.se> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/evm: improve block/state test runner (#30633) * unify `staterunner` and `blockrunner` CLI flags, especially around tracing * added support for struct logger or json logging (although having issue #30658) * new --cross-check flag to validate the stateless witness collection / execution matches stateful * adds support for tracing the stateless execution when a tracer is set (to more easily debug differences) * --human for more readable test summary * directory or file input, so if you pass tests/spec-tests/fixtures/blockchain_tests it will execute all blockchain tests * fuzzing: fix oss-fuzz fuzzer (#30845) The fuzzer added recenly to fuzz the eth handler doesn't build on oss-fuzz, because it also has dependencies in the peer_test.go. This change fixes it, I hope, by adding that file also for preprocessing. * internal/debug: rename --trace to --go-execution-trace (#30846) This flag is very rarely needed, so it's OK for it to have a verbose name. The name --trace also conflicts with the concept of EVM tracing, which is much more heavily used. * eth/downloader: move SyncMode to package eth/ethconfig (#30847) Lots of packages depend on eth/downloader just for the SyncMode type. Since we have a dedicated package for eth protocol configuration, it makes more sense to define SyncMode there, turning eth/downloader into more of a leaf package. * CODEOWNERS: add some more entries for auto assignment (#30851) * cmd/evm, eth/tracers: refactor structlogger and make it streaming (#30806) This PR refactors the structlog a bit, making it so that it can be used in a streaming mode. ------------- OBS: this PR makes a change in the input `config` config, the third input-parem field to `debug.traceCall`. Previously, seteting it to e.g. ` {"enableMemory": true, "limit": 1024}` would mean that the response was limited to `1024` items. Since an 'item' may include both memory and storage, the actual size of the response was undertermined. After this change, the response will be limited to `1024` __`bytes`__ (or thereabouts). ----------- The commandline usage of structlog now uses the streaming mode, leaving the non-streaming mode of operation for the eth_Call. There are two benefits of streaming mode 1. Not have to maintain a long list of operations, 2. Not have to duplicate / n-plicate data, e.g. memory / stack / returndata so that each entry has their own private slice. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/tracing: extends tracing.Hooks with OnSystemCallStartV2 (#30786) This PR extends the Hooks interface with a new method, `OnSystemCallStartV2`, which takes `VMContext` as its parameter. Motivation By including `VMContext` as a parameter, the `OnSystemCallStartV2` hook achieves parity with the `OnTxStart` hook in terms of provided insights. This alignment simplifies the inner tracer logic, enabling consistent handling of state changes and internal calls within the same framework. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * trie/utils: ensure master can generate a correct genesis for kaustinen7 (#30856) This imports the following fixes: - update gnark to 1.1.0 - update go-verkle to 0.2.2 - fix: main storage offset bug (gballet/go-ethereum#329) - fix: tree key generation (gballet/go-ethereum#401) --------- Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> * core/txpool: remove unused parameter `local` (#30871) * core/state: enable partial-functional reader (snapshot integration pt 3) (#30650) It's a pull request based on https://github.com/ethereum/go-ethereum/pull/30643 In this pull request, the partial functional state reader is enabled if **legacy snapshot is not enabled**. The tracked flat states in pathdb will be used to serve the state retrievals, as the second implementation to fasten the state access. This pull request should be a noop change in normal cases. * cmd/evm: consolidate evm output switches (#30849) This PR attempts to clean up some ambiguities and quirks from recent changes to evm flag handling. This PR mainly focuses on `evm run` subcommand, to use the same flags for configuring tracing/output options as `statetest/blocktest` does. Additionally, it adds quite a lot of tests for expected outputs of the various subcommands, to avoid accidental changes. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core/vm: remove unnecessary comment (#30887) * metrics, cmd/geth: change init-process of metrics (#30814) This PR modifies how the metrics library handles `Enabled`: previously, the package `init` decided whether to serve real metrics or just dummy-types. This has several drawbacks: - During pkg init, we need to determine whether metrics are enabled or not. So we first hacked in a check if certain geth-specific commandline-flags were enabled. Then we added a similar check for geth-env-vars. Then we almost added a very elaborate check for toml-config-file, plus toml parsing. - Using "real" types and dummy types interchangeably means that everything is hidden behind interfaces. This has a performance penalty, and also it just adds a lot of code. This PR removes the interface stuff, uses concrete types, and allows for the setting of Enabled to happen later. It is still assumed that `metrics.Enable()` is invoked early on. The somewhat 'heavy' operations, such as ticking meters and exp-decay, now checks the enable-flag to prevent resource leak. The change may be large, but it's mostly pretty trivial, and from the last time I gutted the metrics, I ensured that we have fairly good test coverage. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build: update to Go 1.23.4 (#30872) * accounts/abi: support unpacking solidity errors (#30738) This PR adds the error fragments to `func (abi ABI) getArguments` which allows typed decoding of errors. * core/state: remove pointless wrapper functions (#30891) * p2p: fix DiscReason encoding/decoding (#30855) This fixes an issue where the disconnect message was not wrapped in a list. The specification requires it to be a list like any other message. In order to remain compatible with legacy geth versions, we now accept both encodings when parsing a disconnect message. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * internal/ethapi: add block override to estimateGas (#30695) Add block overrides to `eth_estimateGas` to align consistency with `eth_call`. https://github.com/ethereum/go-ethereum/issues/27800#issuecomment-1658186166 Fixes https://github.com/ethereum/go-ethereum/issues/28175 --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * p2p: DNS resolution for static nodes (#30822) Closes #23210 # Context When deploying Geth in Kubernetes with ReplicaSets, we encountered two DNS-related issues affecting node connectivity. First, during startup, Geth tries to resolve DNS names for static nodes too early in the config unmarshaling phase. If peer nodes aren't ready yet (which is common in Kubernetes rolling deployments), this causes an immediate failure: ``` INFO [11-26|10:03:42.816] Starting Geth on Ethereum mainnet... INFO [11-26|10:03:42.817] Bumping default cache on mainnet provided=1024 updated=4096 Fatal: config.toml, line 81: (p2p.Config.StaticNodes) lookup idontexist.geth.node: no such host ``` The second issue comes up when pods get rescheduled to different nodes - their IPs change but peers keep using the initially resolved IP, never updating the DNS mapping. This PR adds proper DNS support for enode:// URLs by deferring resolution to connection time. It also handles DNS failures gracefully instead of failing fatally during startup, making it work better in container environments where IPs are dynamic and peers come and go during rollouts. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * all: implement eip-7702 set code tx (#30078) This PR implements EIP-7702: "Set EOA account code". Specification: https://eips.ethereum.org/EIPS/eip-7702 > Add a new transaction type that adds a list of `[chain_id, address, nonce, y_parity, r, s]` authorization tuples. For each tuple, write a delegation designator `(0xef0100 ++ address)` to the signing account’s code. All code reading operations must load the code pointed to by the designator. --------- Co-authored-by: Mario Vega <marioevz@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com> * trie/pathdb: state iterator (snapshot integration pt 4) (#30654) In this pull request, the state iterator is implemented. It's mostly a copy-paste from the original state snapshot package, but still has some important changes to highlight here: (a) The iterator for the disk layer consists of a diff iterator and a disk iterator. Originally, the disk layer in the state snapshot was a wrapper around the disk, and its corresponding iterator was also a wrapper around the disk iterator. However, due to structural differences, the disk layer iterator is divided into two parts: - The disk iterator, which traverses the content stored on disk. - The diff iterator, which traverses the aggregated state buffer. Checkout `BinaryIterator` and `FastIterator` for more details. (b) The staleness management is improved in the diffAccountIterator and diffStorageIterator Originally, in the `diffAccountIterator`, the layer’s staleness had to be checked within the Next function to ensure the iterator remained usable. Additionally, a read lock on the associated diff layer was required to first retrieve the account blob. This read lock protection is essential to prevent concurrent map read/write. Afterward, a staleness check was performed to ensure the retrieved data was not outdated. The entire logic can be simplified as follows: a loadAccount callback is provided to retrieve account data. If the corresponding state is immutable (e.g., diff layers in the path database), the staleness check can be skipped, and a single account data retrieval is sufficient. However, if the corresponding state is mutable (e.g., the disk layer in the path database), the callback can operate as follows: ```go func(hash common.Hash) ([]byte, error) { dl.lock.RLock() defer dl.lock.RUnlock() if dl.stale { return nil, errSnapshotStale } return dl.buffer.states.mustAccount(hash) } ``` The callback solution can eliminate the complexity for managing concurrency with the read lock for atomic operation. * core/vm, go.mod: update uint256 and use faster method to write to memory (#30868) Updates geth to use the latest uint256, and use faster memory-writer * accounts/abi/bind: make it possible to wait for tx hash (#30079) This change adds methods which makes it possible for to wait for a transaction with a specific hash when deploying contracts during abi bind interaction. --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * core: fixes for Prague fork in GenerateChain (#30924) Adding some missing functionality I noticed while updating the hivechain tool for the Prague fork: - we forgot to process the parent block hash - added `ConsensusLayerRequests` to get the requests list of the block * build(deps): bump golang.org/x/crypto from 0.26.0 to 0.31.0 (#30921) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.26.0 to 0.31.0. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * core/vm: make all opcodes proper type (#30925) Noticed this omission while doing some work on goevmlab. We don't properly type some of the opcodes, but apparently implicit casting works in all the internal usecases. * core/types, internal/ethapi: fixes for prague RPC encoding (#30926) Fixing some issues I found while regenerating RPC tests for Prague: - Authorization signature values were not encoded as hex - `requestsRoot` in block should be `requestsHash` - `authorizationList` should work for `eth_call` * cmd/evm: make evm statetest accept non-json files (#30927) This fixes a regression introduced recently. Without this fix, it's not possible to use statetests without `.json` suffix. This is problematic for goevmlab `minimizer`, which appends the suffix `.min` during processing. * core/types: updates for EIP-7702 API functions (#30933) Here I am proposing two small changes to the exported API for EIP-7702: (1) `Authorization` has a very generic name, but it is in fact only used for one niche use case: authorizing code in a `SetCodeTx`. So I propose calling it `SetCodeAuthorization` instead. The signing function is renamed to `SignSetCode` instead of `SignAuth`. (2) The signing function for authorizations should take key as the first parameter, and the authorization second. The key will almost always be in a variable, while the authorization can be given as a literal. * core/types: rename SetCodeAuthorization 'v' to 'yParity' The API spec requires the name yParity. * cmd/evm: update tests for SetCodeAuthorization JSON encoding change (#30936) Fixing a regression introduced by73a4ecf675, which I accidentally pushed to the master branch directly. * core, core/types: rename AuthList to SetCodeAuthorizations (#30935) As a follow-up to #30933, I propose to also use the SetCode prefix in our internal APIs for the authorization list. * params: update system contracts for prague devnet-5 (#30938) * internal/flags: update copyright year to 2025 (#30976) * crypto/bn256: fix MulScalar (#30974) The `a` parameter should be used in the `MulScalar` function. The upstream cloudflare and google repos have already merged fixes. Reference: *8d7daa0c54* https://github.com/cloudflare/bn256/pull/33 * all: use cmp.Compare (#30958) * eth/tracers/logger: skip system calls (#30923) This commit makes it so that the struct logger will not emit logs while system calls are being executed. This will make it consistent with the JSON and MD loggers. It is as it stands hard to distinguish when system calls are being processed vs when a tx is being processed. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * internal/ethapi: update default simulation timestamp increment to 12 (#30981) Update the default timestamp increment to 12s for `eth_simulate` endpoint * core/rawdb: fix panic in freezer (#30973) Fixes an issue where the node panics when an LStat fails with something other than os.ErrNotExist closes https://github.com/ethereum/go-ethereum/issues/30968 * core/types: improve printList in DeriveSha test (#30969) * eth/protocols/eth: prevent hanging dispatch (#30918) This PR attempts to fix a strange test-failure (timeout) observed on a windows-32 platform. https://ci.appveyor.com/project/ethereum/go-ethereum/builds/51174391/job/d8ascanwwltrlqd5 A goroutine is stuck trying to deliver a response: ``` goroutine 9632 [select, 29 minutes]: github.com/ethereum/go-ethereum/eth/protocols/eth.(*Peer).dispatchResponse(0x314f100, 0x3e5f6d0, 0x3acbb84) C:/projects/go-ethereum/eth/protocols/eth/dispatcher.go:172 +0x2a5 github.com/ethereum/go-ethereum/eth/protocols/eth.handleBlockHeaders({0x12abe68, 0x30021b8}, {0x12a815c, 0x40b41c0}, 0x314f100) C:/projects/go-ethereum/eth/protocols/eth/handlers.go:301 +0x173 github.com/ethereum/go-ethereum/eth/protocols/eth.handleMessage({0x12abe68, 0x30021b8}, 0x314f100) C:/projects/go-ethereum/eth/protocols/eth/handler.go:205 +0x4f6 github.com/ethereum/go-ethereum/eth/protocols/eth.Handle({0x12abe68, 0x30021b8}, 0x314f100) C:/projects/go-ethereum/eth/protocols/eth/handler.go:149 +0x33 github.com/ethereum/go-ethereum/eth.testSnapSyncDisabling.func1(0x314f100) C:/projects/go-ethereum/eth/sync_test.go:65 +0x33 github.com/ethereum/go-ethereum/eth.(*handler).runEthPeer(0x30021b8, 0x314f100, 0x427f648) C:/projects/go-ethereum/eth/handler.go:355 +0xe65 created by github.com/ethereum/go-ethereum/eth.testSnapSyncDisabling in goroutine 11 C:/projects/go-ethereum/eth/sync_test.go:64 +0x54f FAIL github.com/ethereum/go-ethereum/eth 1800.138s ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/clef: fix JS issues in documentation (#30980) Fixes a couple of js-flaws in the docs * triedb/pathdb: fix tester generator (#30972) This change fixes is a rare bug in test generator: If the run is very unlucky it can use `modifyAccountOp` / `deleteAccountOp` without creating any account, leading to have a trie root same as the parent. This change makes the first operation always be a creation. * README: remove private network section from readme (#31005) * triedb/pathdb: configure different node hasher in pathdb (#31008) As the node hash scheme in verkle and merkle are totally different, the original default node hasher in pathdb is no longer suitable. Therefore, this pull request configures different node hasher respectively. * build: upgrade golangci-lint to v1.63.4 (#31019) This PR upgrades `golangci-lint` to v1.63.4 and fixes a warn message which is reported by v1.63.4: ```text WARN [config_reader] The configuration option `run.skip-dirs-use-default` is deprecated, please use `issues.exclude-dirs-use-default`. ``` Also fixes 2 warnings which are reported by v1.63.4: ```text core/txpool/blobpool/blobpool.go:1754:12: S1005: unnecessary assignment to the blank identifier (gosimple) for acct, _ := range p.index { ^ core/txpool/legacypool/legacypool.go:1989:19: S1005: unnecessary assignment to the blank identifier (gosimple) for localSender, _ := range pool.locals.accounts { ^ ``` * eth/tracers/logger: return revert reason (#31013) Fix the error comparison in tracer to prevent dropping revert reason data --------- Co-authored-by: Martin <mrscdevel@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * cmd/devp2p/internal/ethtest: using slices.SortFunc to simplify the code (#31012) Co-authored-by: Felix Lange <fjl@twurst.com> * core/txpool/legacypool: fix flaky test TestAllowedTxSize (#30975) - it was failing because the maximum data length (previously `dataSize`) was set to `txMaxSize - 213` but should had been `txMaxSize - 103` and the last call `dataSize+1+uint64(rand.Intn(10*txMaxSize)))` would sometimes fail depending on rand.Intn. - Maximal transaction data size comment (invalid) replaced by code logic to find the maximum tx length without its data length - comments and variable naming improved for clarity - 3rd pool add test replaced to add just 1 above the maximum length, which is important to ensure the logic is correct * core: remove unused function parameters (#31001) * cmd, core, miner: rework genesis setup (#30907) This pull request refactors the genesis setup function, the major changes are highlighted here: **(a) Triedb is opened in verkle mode if `EnableVerkleAtGenesis` is configured in chainConfig or the database has been initialized previously with `EnableVerkleAtGenesis` configured**. A new config field `EnableVerkleAtGenesis` has been added in the chainConfig. This field must be configured with True if Geth wants to initialize the genesis in Verkle mode. In the verkle devnet-7, the verkle transition is activated at genesis. Therefore, the verkle rules should be used since the genesis. In production networks (mainnet and public testnets), verkle activation always occurs after the genesis block. Therefore, this flag is only made for devnet and should be deprecated later. Besides, verkle transition at non-genesis block hasn't been implemented yet, it should be done in the following PRs. **(b) The genesis initialization condition has been simplified** There is a special mode supported by the Geth is that: Geth can be initialized with an existing chain segment, which can fasten the node sync process by retaining the chain freezer folder. Originally, if the triedb is regarded as uninitialized and the genesis block can be found in the chain freezer, the genesis block along with genesis state will be committed. This condition has been simplified to checking the presence of chain config in key-value store. The existence of chain config can represent the genesis has been committed. * all: fix some typos in comments and names (#31023) * core/types: change SetCodeTx.ChainID to uint256 (#30982) We still need to decide how to handle non-specfic `chainId` in the JSON encoding of authorizations. With `chainId` being a uint64, the previous implementation just used value zero. However, it might actually be more correct to use the value `null` for this case. * eth/gasprice: ensure cache purging goroutine terminates with subscription (#31025) * beacon/engine: check for empty requests (#31010) According to https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md#engine_newpayloadv4: > Elements of the list MUST be ordered by request_type in ascending order. Elements with empty request_data MUST be excluded from the list. --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * core: use sync.Once for SenderCacher initialization (#31029) This changes the SenderCacher so its goroutines will only be started on first use. Avoids starting them when package core is just imported but core.BlockChain isn't used. * core/txpool/legacypool: ensure pending nonces are reset by SubPool.Clear (#31020) closes https://github.com/ethereum/go-ethereum/issues/30842 * core/tracing: document `OnCodeChange` now being called from SelfDestruct (#31007) Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> * all: implement state history v2 (#30107) This pull request delivers the new version of the state history, where the raw storage key is used instead of the hash. Before the cancun fork, it's supported by protocol to destruct a specific account and therefore, all the storage slot owned by it should be wiped in the same transition. Technically, storage wiping should be performed through storage iteration, and only the storage key hash will be available for traversal if the state snapshot is not available. Therefore, the storage key hash is chosen as the identifier in the old version state history. Fortunately, account self-destruction has been deprecated by the protocol since the Cancun fork, and there are no empty accounts eligible for deletion under EIP-158. Therefore, we can conclude that no storage wiping should occur after the Cancun fork. In this case, it makes no sense to keep using hash. Besides, another big reason for making this change is the current format state history is unusable if verkle is activated. Verkle tree has a different key derivation scheme (merkle uses keccak256), the preimage of key hash must be provided in order to make verkle rollback functional. This pull request is a prerequisite for landing verkle. Additionally, the raw storage key is more human-friendly for those who want to manually check the history, even though Solidity already performs some hashing to derive the storage location. --- This pull request doesn't bump the database version, as I believe the database should still be compatible if users degrade from the new geth version to old one, the only side effect is the persistent new version state history will be unusable. --------- Co-authored-by: Zsolt Felfoldi <zsfelfoldi@gmail.com> * ethdb/memorydb: faster DeleteRange (#31038) This PR replaces the iterator based DeleteRange implementation of memorydb with a simpler and much faster loop that directly deletes keys in the order of iteration instead of unnecessarily collecting keys in memory and sorting them. --------- Co-authored-by: Martin HS <martin@swende.se> * cmd/abigen: require either `--abi` or `--combined-json` (#31045) This PR addresses issue #30768 , which highlights that running cmd/abigen/abigen --pkg my_package example.json (erroneously omitting the --abi flag) generates an empty binding, when it should fail explicitly. --------- Co-authored-by: jwasinger <j-wasinger@hotmail.com> * core/types: correct chainId check for pragueSigner (#31032) Use zero value check for the pragueSigner This aligns with cancunSigner and londonSigner as well. * build: upgrade -dlgo version to Go 1.23.5 (#31037) * core/types: initialize ChainID in SetCodeTx copy method (#31054) * core/txpool: terminate subpool reset goroutine if pool was closed (#31030) if the pool terminates before `resetDone` can be read, then the go-routine will hang. * cmd/evm: refactor handling output-files for `t8n` (#30854) As part of trying to make the inputs and outputs of the evm subcommands more streamlined and aligned, this PR modifies how `evm t8n` manages output-files. Previously, we do a kind of wonky thing where between each transaction, we invoke a `getTracer` closure. In that closure, we create a new output-file, a tracer, and then make the tracer stream output to the file. We also fiddle a bit to ensure that the file becomes properly closed. It is a kind of hacky solution we have in place. This PR changes it, so that from the execution-pipeline point of view, we have just a regular tracer. No fiddling with re-setting it or closing files. That particular tracer, however, is a bit special: it takes care of creating new files per transaction (in the tx-start-hook) and closing (on tx-end-hook). Also instantiating the right type of underlying tracer, which can be a json-logger or a custom tracer. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * eth/filters: ensure API timeoutLoop terminates with event system (#31056) Discovered from failing test introduced https://github.com/ethereum/go-ethereum/pull/31033 . We should ensure `timeoutLoop` terminates if the filter event system is terminated. * go.mod: remove toolchain line (#31057) We have our own system for downloading the toolchain, and really don't want Go's to get in the way of that. We may switch to Go's builtin toolchain support, but not now. * cmd/evm: restore --bench flag to evm statetest (#31055) Refactoring of the `evm` command moved where some commands were valid. One command, `--bench`, used to work in `evm statetest`. The pluming is still in place. This PR puts the `--bench` flag in the place the trace flags were moved, and adds tests to validate the bench flag operates in `run` and `statetest` --------- Co-authored-by: Felix Lange <fjl@twurst.com> * p2p: support configuring NAT in TOML file (#31041) This is an alternative for #27407 with a solution based on gencodec. With the PR, one can now configure like this: ``` # config.toml [Node.P2P] NAT = "extip:33.33.33.33" ``` ```shell $ geth --config config.toml ... INFO [01-17|16:37:31.436] Started P2P networking self=enode://2290...ab@33.33.33.33:30303 ``` * go.mod: gencodec stable v0.1.0 (#31062) * triedb/pathdb: fix state revert on v2 history (#31060) State history v2 has been shipped and will take effect after the Cancun fork. However, the state revert function does not differentiate between v1 and v2, instead blindly using the storage map key for state reversion. This mismatch between the keys of the live state set and the state history can trigger a panic: `non-existent storage slot for reverting`. This flaw has been fixed in this PR. * trie: reduce allocations in stacktrie (#30743) This PR uses various tweaks and tricks to make the stacktrie near alloc-free. ``` [user@work go-ethereum]$ benchstat stacktrie.1 stacktrie.7 goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/trie cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ stacktrie.1 │ stacktrie.7 │ │ sec/op │ sec/op vs base │ Insert100K-8 106.97m ± 8% 88.21m ± 34% -17.54% (p=0.000 n=10) │ stacktrie.1 │ stacktrie.7 │ │ B/op │ B/op vs base │ Insert100K-8 13199.608Ki ± 0% 3.424Ki ± 3% -99.97% (p=0.000 n=10) │ stacktrie.1 │ stacktrie.7 │ │ allocs/op │ allocs/op vs base │ Insert100K-8 553428.50 ± 0% 22.00 ± 5% -100.00% (p=0.000 n=10) ``` Also improves derivesha: ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/core/types cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ derivesha.1 │ derivesha.2 │ │ sec/op │ sec/op vs base │ DeriveSha200/stack_trie-8 477.8µ ± 2% 430.0µ ± 12% -10.00% (p=0.000 n=10) │ derivesha.1 │ derivesha.2 │ │ B/op │ B/op vs base │ DeriveSha200/stack_trie-8 45.17Ki ± 0% 25.65Ki ± 0% -43.21% (p=0.000 n=10) │ derivesha.1 │ derivesha.2 │ │ allocs/op │ allocs/op vs base │ DeriveSha200/stack_trie-8 1259.0 ± 0% 232.0 ± 0% -81.57% (p=0.000 n=10) ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * eth/catalyst: fail on duplicate request types (#31071) Refer to: https://github.com/ethereum/execution-apis/pull/623 * accounts/usbwallet: fix ledger access for latest firmware and add Ledger Flex (#31004) The latest firmware for Ledger Nano S Plus now returns `0x5000` for it's product ID, which doesn't match any of the product IDs enumerated in `hub.go`. This PR removes the assumption about the interfaces exposed, and simply checks the upper byte for a match. Also adds support for the `0x0007` / `0x7000` product ID (Ledger Flex). * core/vm: implement EIP-2537 spec updates (#30978) Reference: - Remove MUL precompiles: https://github.com/ethereum/EIPs/pull/8945 - Pricing change for pairing operation: https://github.com/ethereum/EIPs/pull/9098 - Pricing change for add, mapping and mul operations: https://github.com/ethereum/EIPs/pull/9097 - Pricing change for MSM operations: https://github.com/ethereum/EIPs/pull/9116 --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * p2p/nat: add stun protocol (#31064) This implements a basic mechanism to query the node's external IP using a STUN server. There is a built-in list of public STUN servers for convenience. The new detection mechanism must be selected explicitly using `--nat=stun` and is not enabled by default in Geth. Fixes #30881 --------- Co-authored-by: Felix Lange <fjl@twurst.com> * fix README.md (#31076) Hi I fixed 2 minor spelling issues. --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * chore: fix various comments (#31082) * all: nuke total difficulty (#30744) The total difficulty is the sum of all block difficulties from genesis to a certain block. This value was used in PoW for deciding which chain is heavier, and thus which chain to select. Since PoS has a different fork selection algorithm, all blocks since the merge have a difficulty of 0, and all total difficulties are the same for the past 2 years. Whilst the TDs are mostly useless nowadays, there was never really a reason to mess around removing them since they are so tiny. This reasoning changes when we go down the path of pruned chain history. In order to reconstruct any TD, we **must** retrieve all the headers from chain head to genesis and then iterate all the difficulties to compute the TD. In a world where we completely prune past chain segments (bodies, receipts, headers), it is not possible to reconstruct the TD at all. In a world where we still keep chain headers and prune only the rest, reconstructing it possible as long as we process (or download) the chain forward from genesis, but trying to snap sync the head first and backfill later hits the same issue, the TD becomes impossible to calculate until genesis is backfilled. All in all, the TD is a messy out-of-state, out-of-consensus computed field that is overall useless nowadays, but code relying on it forces the client into certain modes of operation and prevents other modes or other optimizations. This PR completely nukes out the TD from the node. It doesn't compute it, it doesn't operate on it, it's as if it didn't even exist. Caveats: - Whenever we have APIs that return TD (devp2p handshake, tracer, etc.) we return a TD of 0. - For era files, we recompute the TD during export time (fairly quick) to retain the format content. - It is not possible to "verify" the merge point (i.e. with TD gone, TTD is useless). Since we're not verifying PoW any more, just blindly trust it, not verifying but blindly trusting the many year old merge point seems just the same trust model. - Our tests still need to be able to generate pre and post merge blocks, so they need a new way to split the merge without TTD. The PR introduces a settable ttdBlock field on the consensus object which is used by tests as the block where originally the TTD happened. This is not needed for live nodes, we never want to generate old blocks. - One merge transition consensus test was disabled. With a non-operational TD, testing how the client reacts to TTD is useless, it cannot react. Questions: - Should we also drop total terminal difficulty from the genesis json? It's a number we cannot react on any more, so maybe it would be cleaner to get rid of even more concepts. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * .github: add lint step (#31068) * core/{.,state,vm},miner,eth/tracers,tests: implement 7709 with a syscall flag (#31036) Same as #31015 but requires the contract to exist. Not compatible with any verkle testnet up to now. This adds a `isSytemCall` flag so that it is possible to detect when a system call is executed, so that the code execution and other locations are not added to the witness. --------- Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * build: bump test timeout (#31095) Travis often fails because the test times out. * .travis.yml: change arch for Docker build to arm64 (#31096) This is an attempt to work around a gcc issue in the Docker build. * Revert ".travis.yml: change arch for Docker build to arm64 (#31096)" This reverts commit7b96ec4dae. * build: retry PPA upload up to three times (#31099) * crypto: add IsOnCurve check (#31100) * build: provide a flag to disable publishing in dockerx build (#31098) This changes the `-upload` flag to just toggle the upload. The remote image name is now configured using the `-hub` flag. * version: begin v1.15.0 release cycle * all: add build tags for wasip1 (#31090) * core: implement eip-7623 floor data gas (#30946) This PR builds on #29040 and updates it to the new version of the spec. I filled the EEST tests and they pass. Link to spec: https://eips.ethereum.org/EIPS/eip-7623 --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: lightclient <lightclient@protonmail.com> * core/vm: EXTCODE* return delegation designator for 7702 (#31089) Implements https://github.com/ethereum/EIPs/pull/9248 * params: update system contract addresses for devnet-6 (#31102) Finalize Prague system contract addresses. Reference: * https://github.com/ethereum/EIPs/pull/9287 * https://github.com/ethereum/EIPs/pull/9288 * https://github.com/ethereum/EIPs/pull/9289 * eth/catalyst: fix validation of type 0 request (#31103) I caught this error on Hive. It was introduced by https://github.com/ethereum/go-ethereum/pull/31071 because after adding the equality check the request type 0 will be rejected. * core/vm: simplify tracer hook invocation in interpreter loop (#31074) Removes duplicate code in the interpreter loop. * tests/fuzzers/bls12381: fix error message in fuzzCrossG2Add (#31113) Fixes a typo in the error message within the `fuzzCrossG2Add` function. The panic message incorrectly references "G1 point addition mismatch" when it should be "G2 point addition mismatch," as the function deals with G2 points. This doesn't affect functionality but could cause confusion during debugging. I've updated the message to reflect the correct curve. * core/rawdb: introduce flush offset in freezer (#30392) This is a follow-up PR to #29792 to get rid of the data file sync. **This is a non-backward compatible change, which increments the database version from 8 to 9**. We introduce a flushOffset for each freezer table, which tracks the position of the most recently fsync’d item in the index file. When this offset moves forward, it indicates that all index entries below it, along with their corresponding data items, have been properly persisted to disk. The offset can also be moved backward when truncating from either the head or tail of the file. Previously, the data file required an explicit fsync after every mutation, which was highly inefficient. With the introduction of the flush offset, the synchronization strategy becomes more flexible, allowing the freezer to sync every 30 seconds instead. The data items above the flush offset are regarded volatile and callers must ensure they are recoverable after the unclean shutdown, or explicitly sync the freezer before any proceeding operations. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core: copy genesis before modifying (#31097) This PR fixes a data race in SetupGenesisWithOverride. * params: start osaka fork (#31125) This PR defines the Osaka fork. An easy first step to start our work on the next hardfork (This is needed for EOF testing as well) --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * params,core: add max and target value to chain config (#31002) Implements [EIP-7840](https://github.com/ethereum/EIPs/pull/9129) and [EIP-7691](d96625a4dc/EIPS/eip-7691.md). --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Felix Lange <fjl@twurst.com> * core: assign default difficulty to zero for chain without ethash (#31067) I hit this case while trying something with the simulated backend. The EVM only enables instruction set forks after the merge when 'Random' is set. In the simulated backend, the random value will be set via the engine API for all blocks after genesis. But for the genesis block itself, the random value will not be assigned in the vm.BlockContext because the genesis has a non-zero difficulty. For my case, this meant that estimateGas did not work for the first transaction sent on the simulated chain, since the contract contained a PUSH0 instruction. This could also be fixed by explicitly configuring a zero difficulty in the simulated backend. However, I think that zero difficulty is a better default these days. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * core/txpool: remove locals-tracking from txpools (#30559) Replaces #29297, descendant from #27535 --------- This PR removes `locals` as a concept from transaction pools. Therefore, the pool now acts as very a good simulation/approximation of how our peers' pools behave. What this PR does instead, is implement a locals-tracker, which basically is a little thing which, from time to time, asks the pool "did you forget this transaction?". If it did, the tracker resubmits it. If the txpool _had_ forgotten it, chances are that the peers had also forgotten it. It will be propagated again. Doing this change means that we can simplify the pool internals, quite a lot. ### The semantics of `local` Historically, there has been two features, or usecases, that has been combined into the concept of `locals`. 1. "I want my local node to remember this transaction indefinitely, and resubmit to the network occasionally" 2. "I want this (valid) transaction included to be top-prio for my miner" This PR splits these features up, let's call it `1: local` and `2: prio`. The `prio` is not actually individual transaction, but rather a set of `address`es to prioritize. The attribute `local` means it will be tracked, and `prio` means it will be prioritized by miner. For `local`: anything transaction received via the RPC is marked as `local`, and tracked by the tracker. For `prio`: any transactions from this sender is included first, when building a block. The existing commandline-flag `--txpool.locals` sets the set of `prio` addresses. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/txpool/blobpool: fix incorrect arguments in test (#31127) Fixes the linter on master which was broken by https://github.com/ethereum/go-ethereum/pull/30559 * consensus/misc/eip4844: use head's target blobs, not parent (#31101) A clarification was made to EIP-7691 stating that at the fork boundary it is required to use the target blob count associated with the head block, rather than the parent as implemented here. See for more: https://github.com/ethereum/EIPs/pull/9249 * consensus/misc/eip4844: more changes for blob gas calculation (#31128) This PR changes the signature of `CalcExcessBlobGas` to take in just the header timestamp instead of the whole object. It also adds a sanity check for the parent->child block order to `VerifyEIP4844Header`. * core/tracing: state journal wrapper (#30441) Here we add some more changes for live tracing API v1.1: - Hook `OnSystemCallStartV2` was introduced with `VMContext` as parameter. - Hook `OnBlockHashRead` was introduced. - `GetCodeHash` was added to the state interface - The new `WrapWithJournal` construction helps with tracking EVM reverts in the tracer. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * all: update license comments and AUTHORS (#31133) * build: update to Go 1.23.6 (#31130) Co-authored-by: Felix Lange <fjl@twurst.com> * build: update EEST fixtures to prague devnet-6 (#31088) Co-authored-by: lightclient <lightclient@protonmail.com> * version: release go-ethereum v1.15.0 * version: begin v1.15.1 release cycle * cmd/devp2p/internal/ethtest: remove TD from status validation (#31137) After recent changes in Geth (removing TD):39638c81c5 (diff-d70a44d4b7a0e84fe9dcca25d368f626ae6c9bc0b8fe9690074ba92d298bcc0d)Non-Geth clients are failing many devp2p tests with an error: `peering failed: status exchange failed: wrong TD in status: have 1 want 0` Right now only Geth is passing it - all other clients are affected by this change. I think there should be no validation of TD when checking `Status` message in hive tests. Now Geth has 0 (and hive tests requires 0) and all other clients have actual TD. And on real networks there is no validation of TD when peering * params,core/forkid: enable prague on holesky and sepolia (#31139) Agreed to the following fork dates for Holesky and Sepolia on ACDC 150 Holesky slot: 3710976 (Mon, Feb 24 at 21:55:12 UTC) Sepolia slot: 7118848 (Wed, Mar 5 at 07:29:36 UTC) * consensus/beacon: remove TestingTTDBlock (#31153) This removes the method `TestingTTDBlock` introduced by #30744. It was added to make the beacon consensus engine aware of the merge block in tests without relying on the total difficulty. However, tracking the merge block this way is very annoying. We usually configure forks in the `ChainConfig`, but the method is on the consensus engine, which isn't always created in the same place. By sidestepping the `ChainConfig` we don't get the usual fork-order checking, so it's possible to enable the merge before the London fork, for example. This in turn can lead to very hard-to-debug outputs and validation errors. So here I'm changing the consensus engine to check the `MergeNetsplitBlock` instead. Alternatively, we assume a network is merged if it has a `TerminalTotalDifficulty` of zero, which is a very common configuration in tests. * p2p/discover: remove unused parameter in revalidationList.get (#31155) * p2p/discover: make discv5 response timeout configurable (#31119) * core/txpool/legacypool: add support for SetCode transactions (#31073) The new SetCode transaction type introduces some additional complexity when handling the transaction pool. This complexity stems from two new account behaviors: 1. The balance and nonce of an account can change during regular transaction execution *when they have a deployed delegation*. 2. The nonce and code of an account can change without any EVM execution at all. This is the "set code" mechanism introduced by EIP-7702. The first issue has already been considered extensively during the design of ERC-4337, and we're relatively confident in the solution of simply limiting the number of in-flight pending transactions an account can have to one. This puts a reasonable bound on transaction cancellation. Normally to cancel, you would need to spend 21,000 gas. Now it's possible to cancel for around the cost of warming the account and sending value (`2,600+9,000=11,600`). So 50% cheaper. The second issue is more novel and needs further consideration. Since authorizations are not bound to a specific transaction, we cannot drop transactions with conflicting authorizations. Otherwise, it might be possible to cherry-pick authorizations from txs and front run them with different txs at much lower fee amounts, effectively DoSing the authority. Fortunately, conflicting authorizations do not affect the underlying validity of the transaction so we can just accept both. --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Felix Lange <fjl@twurst.com> * internal/ethapi: fix panic in debug methods (#31157) Fixes an error when the block is not found in debug methods. * trie: copy preimage store pointer in StateTrie.Copy (#31158) This fixes an error where executing `evm run --dump ...` omits preimages from the dump (because the statedb used for execution is a copy of another instance). * go.mod: update blst to v0.3.14 (#31165) closes https://github.com/ethereum/go-ethereum/issues/31072 BLST released their newest version which includes a fix for go v.1.24: https://github.com/supranational/blst/releases/tag/v0.3.14 I went through all commits between 0.3.14 and 0.3.13 for a sanity check * core: sanity-check fork configuration in genesis (#31171) This is to prevent a crash on startup with a custom genesis configuration. With this change in place, upgrading a chain created by geth v1.14.x and below will now print an error instead of crashing: Fatal: Failed to register the Ethereum service: invalid chain configuration: missing entry for fork "cancun" in blobSchedule Arguably this is not great, and it should just auto-upgrade the config. We'll address this in a follow-up PR for geth v1.15.2 * core/rawdb: skip setting flushOffset in read-only mode (#31173) This PR addresses a flaw in the freezer table upgrade path. In v1.15.0, freezer table v2 was introduced, including an additional field (`flushOffset`) maintained in the metadata file. To ensure backward compatibility, an upgrade path was implemented for legacy freezer tables by setting `flushOffset` to the size of the index file. However, if the freezer table is opened in read-only mode, this file write operation is rejected, causing Geth to shut down entirely. Given that invalid items in the freezer index file can be detected and truncated, all items in freezer v0 index files are guaranteed to be complete. Therefore, when operating in read-only mode, it is safe to use the freezer data without performing an upgrade. * version: release go-ethereum v1.15.1 stable * version: begin v1.15.2 release cycle * core/types: create block's bloom by merging receipts' bloom (#31129) Currently, when calculating block's bloom, we loop through all the receipt logs to calculate the hash value. However, normally, after going through applyTransaction, the receipt's bloom is already calculated based on the receipt log, so the block's bloom can be calculated by just ORing these receipt's blooms. ``` goos: darwin goarch: arm64 pkg: github.com/ethereum/go-ethereum/core/types cpu: Apple M1 Pro BenchmarkCreateBloom BenchmarkCreateBloom/small BenchmarkCreateBloom/small-10 810922 1481 ns/op 104 B/op 5 allocs/op BenchmarkCreateBloom/large BenchmarkCreateBloom/large-10 8173 143764 ns/op 9614 B/op 401 allocs/op BenchmarkCreateBloom/small-mergebloom BenchmarkCreateBloom/small-mergebloom-10 5178918 232.0 ns/op 0 B/op 0 allocs/op BenchmarkCreateBloom/large-mergebloom BenchmarkCreateBloom/large-mergebloom-10 54110 22207 ns/op 0 B/op 0 allocs/op ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Zsolt Felfoldi <zsfelfoldi@gmail.com> * consensus/beacon: fix isPostMerge for mainnet (#31191) This fixes a regression introduced in #31153 where we didn't consider mainnet to be in PoS, causing #31190. The problem is, `params.MainnetChainConfig` does not have a defined `MergeNetsplitBlock`, so it isn't considered to be in PoS in `CalcDifficulty`. * p2p: fix marshaling of NAT in TOML (#31192) This fixes an issue where a nat.Interface unmarshaled from the TOML config file could not be re-marshaled to TOML correctly. Fixes #31183 * eth/protocols/eth: add discovery iterator to protocol (#31185) We somehow forgot to add this in #30302, so discv5 and DNS have actually been disabled since then. Fixes #31168 * version: release go-ethereum v1.15.2 stable * version: begin v1.15.3 release cycle * trie: do not expect ordering in stacktrie during fuzzing (#31170) This PR removes the assumption of the stacktrie and trie to have the same ordering. This was hit by the fuzzers on oss-fuzz --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * utils: clarify description for history.state flag (#31164) * ethclient: add comment describing block number tags (#30984) Adds a comment on how to use rpc.*BlockNumber and the explanation of the block number tags --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/vm: clean up EVM environmental structure (#31061) This PR does a few things including: - Remove `ContractRef` interface - Remove `vm.AccountRef` which implements `ContractRef` interface - Maintain the `jumpDests` struct in EVM for sharing between call frames - Simplify the delegateCall context initialization * params: add osaka blob schedule (#31174) Prevents crashes when running execution spec tests for osaka * eth/catalyst: support earlier forks in SimulatedBeacon (#31084) Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * build: upgrade -dlgo version to Go 1.24.0 (#31159) Co-authored-by: Felix Lange <fjl@twurst.com> * core/asm: delete assembler/disassembler (#31211) I maintain an improved version of the go-ethereum assembler at https://github.com/fjl/geas. We don't really use core/asm in our tests, and it has some bugs that prevent it from being useful, so I'm removing the package. * .github: downgrade go for lint step (#31217) * core/txpool/legacypool: add setCodeTx reorg test (#31206) This PR adds a test that makes sure that a node can send multiple transactions again once a authorization is removed * internal/ethapi: handle prague system calls in eth_simulate (#31176) eth_simulate was not processing prague system calls for history contract and EL requests resulting in inaccurate stateRoot and requestsRoot fields in the block. * eth/tracers: refactor block context in test runner (#29450) This commit contains a minor refactoring of the block context used within the test runners. --------- Signed-off-by: jsvisa <delweng@gmail.com> * oss-fuzz: remove deprecated targets (#31224) Fixes https://github.com/ethereum/go-ethereum/issues/31223 (sorry, I thought the fork fork would be created on my repo, not upstream, when I used the GH editor) * p2p/nat: remove test with default servers (#31225) The test occasionally fails when network connectivity is bad or if it hits the wrong server. We usually don't add tests with external network dependency so I'm removing them. Fixes #31220 * core/types: remove unneeded todo marker (#31179) * signer/core: fix encoding of `bytes` nested within array (#31049) Fixes an incorrect encoding of recursive bytes types. closes https://github.com/ethereum/go-ethereum/issues/30979 * internal/ethapi: fix prev hashes in eth_simulate (#31122) Shout-out to @Gabriel-Trintinalia for discovering this issue. The gist of it as follows: When processing a block, we should provide the parent block as well as the last 256 block hashes. Some of these parents data (specifically the hash) was incorrect because even though during the processing of the parent block we have updated the header, that header was not updating the TransactionsRoot and ReceiptsRoot fields (types.NewBlock makes a new copy of the header and changes it only on that instance). --------- Co-authored-by: lightclient <lightclient@protonmail.com> * cmd/clef: improve documentation in readme (#31218) Fixed broken or outdated links and improved documentation formatting to ensure consistency and correct references. --------- Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> * build: replace `tenv` linter with `usetesting` (#31172) * eth: report error from setupDiscovery at startup (#31233) I ran into this while trying to debug a discv5 thing. I tried to disable DNS discovery using `--discovery.dns=false`, which doesn't work. Annoyingly, geth started anyway and discarded the error silently. I eventually found my mistake, but it took way longer than it should have. Also including a small change to the error message for invalid DNS URLs here. The user actually needs to see the URL to make sense of the error. * go.mod: update cloudflare-go (#31240) Updates cloudflare-go from v0.79.0 to v0.114.0 which also gets rid of a dependency to `github.com/hashicorp/go-retryablehttp` which had a security flaw. Diff: https://github.com/cloudflare/cloudflare-go/compare/v0.79.0...v0.114.0 I did a quick sanity check on the diff on all methods that we use and went through the release notes, there was nothing related to how we use it afaict * crypto: add comment to FromECDSAPub (#31241) closes https://github.com/ethereum/go-ethereum/issues/26240 * core/txpool: move setcode tx validation into legacyPool (#31209) In this PR, several improvements have been made: Authorization-related validations have been moved to legacyPool. Previously, these checks were part of the standard validation procedure, which applies common validations across different pools. Since these checks are specific to SetCode transactions, relocating them to legacyPool is a more reasonable choice. Additionally, authorization conflict checks are now performed regardless of whether the transaction is a replacement or not. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * params: add deposit contract addresses (#31247) We forgot to add the deposit contract address for holesky, causing deposits to not be flagged correctly --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * ethclient/simulated: add goroutine leak test (#31033) Adds a basic sanity test case to catch any go-routines leaked from instantiation/closing of a simulated backend. * eth/protocols/eth: fix loading "eth" ENR key in dial filter (#31251) This fixes an issue where dial candidates from discv5 would be ignored because the "eth" ENR entry was not loaded correctly. * version: release go-ethereum v1.15.3 stable * version: begin v1.15.4 release cycle * build: filter out .git folder for go generate check (#31265) Fixes lint issue >>> /home/appveyor/.gvm/gos/go1.24.0/bin/go generate ./... ci.go:404: File changed: .git/index ci.go:407: One or more generated files were updated by running 'go generate ./...' exit status 1 * eth/gasprice: fix eth_feeHistory blobGasRatio (#31246) This change divides BlobGasUsed by MaxBlobGasPerBlock instead of MaxBlobsPerBlock. Dividing by MaxBlobsPerBlock meant the blobGasUsedRatio was an incorrect large number. This bug was introduced by a typo [here](e6f3ce7b16 (diff-3357b2399699d7cf954c543cbfb02ff442eb24491e55f5e813e3cc85829b3e8dR110)) Fixes https://github.com/ethereum/go-ethereum/issues/31245 * cmd/workload: RPC workload tests for filters and history (#31189) Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * eth/gasprice: sanity check ratio values (#31270) Follow on to #31246. Adds a sanity check in the test to make sure the ratio value never goes over 1. Would have avoided the issue in #31245. * core/txpool: fix error logs flood caused by removeAuthorities (#31249) when remove an non-SetCodeTxType transaction, error logs flood ``` t=2025-02-25T03:11:06+0000 lvl=error msg="Authority with untracked tx" addr=0xD5bf9221fCB1C31Cd1EE477a60c148d40dD63DC1 hash=0x626fdf205a5b1619deb2f9e51fed567353f80acbd522265b455daa0821c571d9 ``` in this PR, only try to removeAuthorities for txs with SetCodeTxType in addition, the performance of removeAuthorities improved a lot, because no need range all `t.auths` now. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * build: update PPA Go bootstrap version to 1.23 (#31282) This is for fixing the PPA build, which has been failing since the update to Go 1.24. In Go 1.24, the required Go version for bootstrapping was updated to 1.22. In general, they are following through with always depending on the Go version two releases ago for bootstrapping. Since we still support Ubuntu Xenial (16.04) until its EOL date of 04/2026, and Xenial only has golang 1.10 as a package, we now need to build Go a total of four times to get the most recent version. I'm adding a step for Go 1.23 here. This should last us until Go 1.25, which should be out around 04/2026, and we can hopefully drop the first bootstrapping step at that time. * build: simplify go mod tidy check (#31266) This changes the go mod tidy check to use the go mod tidy -diff command, removing the custom diffing for go.mod. The check for go.mod/go.sum is now performed in the check_generate action. Also included is a change where check_generate and check_baddeps will now run on the GitHub Actions lint step. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * all: drop x/exp direct dependency (#30558) This is a not-particularly-important "cleanliness" PR. It removes the last remnants of the `x/exp` package, where we used the `maps.Keys` function. The original returned the keys in a slice, but when it became 'native' the signature changed to return an iterator, so the new idiom is `slices.Collect(maps.Keys(theMap))`, unless of course the raw iterator can be used instead. In some cases, where we previously collect into slice and then sort, we can now instead do `slices.SortXX` on the iterator instead, making the code a bit more concise. This PR might be _slighly_ less optimal, because the original `x/exp` implementation allocated the slice at the correct size off the bat, which I suppose the new code won't. Putting it up for discussion. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build/deb: add step for new Go bootstrap to debian rules (#31283) Next attempt at fixing the build on launchpad.net * core/tracing: stringer for gas and nonce change reasons (#31234) * eth: remove EventMux accessors (#30017) Hi, it seems these methods in the `backend.go` and `api_backend.go` files are not used that expose the eventMux, but that is not needed. * eth: do not add failed tx to localTxTracker (#31202) In transaction-sending APIs such as `eth_sendRawTransaction`, a submitted transaction failing the configured txpool validation rules (i.e. fee too low) would cause an error to be returned, even though the transaction was successfully added into the locals tracker. Once added there, the transaction may even be included into the chain at a later time, when fee market conditions change. This change improves on this by performing the validation in the locals tracker, basically skipping some of the validation rules for local transactions. We still try to add the tx to the main pool immediately, but an error will only be returned for transactions which are fundamentally invalid. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * eth: check blob transaction validity on the peer goroutine when received (#31219) This ensures that if we receive a blob transaction announcement where we cannot link the tx to the sidecar commitments, we will drop the sending peer. This check is added in the protocol handler for the PooledTransactions message. Tests for this have also been added in the cross-client "eth" protocol test suite. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * ethclient: add BlobBaseFee method (#31290) * version: release go-ethereum v1.15.4 stable * version: begin v1.15.5 release cycle * eth/tracers: fix omitempty for memory and storage (#31289) This fixes a regression in the opcode tracer API where we would log empty memory and storage fields. * build: upgrade to Go 1.24.1 and golangci-lint 1.64.4 (#31313) - upgrade -dlgo version to Go 1.24.1 - upgrade golangci-lint version to 1.64.6 * core: match on deposit contract log topic (#31317) This resolves a situation on the Sepolia testnet, which has a different deposit contract. The contract on that network emits two kinds of logs, instead of only deposit events like the deposit contract on mainnet. So we need to skip events with mismatched topics. * version: release v1.15.5 stable * fix: fix compiler errors * feat: merge 1.15.5 * fix: fix lint errors * feat: fix some diffs * feat: update types * feat: update comments * feat: fix some diffs * feat: fix some diffs * test: update tests * feat: update some jsons * test: update core/state_transition.go * feat: fix a test issue * chore: update ci * chore: update ci * feat: update config.go * feat: update core/state_processor.go * feat: update core/state_processor.go * feat: more changes * feat: update * feat: update state * feat: update ci --------- Signed-off-by: wangjingcun <wangjingcun@aliyun.com> Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: Madhur Shrimal <madhur.shrimal@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Naveen <116692862+naveen-imtb@users.noreply.github.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: Karol Chojnowski <karolchojnowski95@gmail.com> Co-authored-by: zhiqiangxu <652732310@qq.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: tianyeyouyou <tianyeyouyou@gmail.com> Co-authored-by: witty <131909329+0xwitty@users.noreply.github.com> Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com> Co-authored-by: bitcoin-lightning <153181187+AtomicInnovation321@users.noreply.github.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Håvard Anda Estensen <haavard.ae@gmail.com> Co-authored-by: Hyunsoo Shin (Lake) <hyunsooda@kaist.ac.kr> Co-authored-by: wangjingcun <wangjingcun@aliyun.com> Co-authored-by: j2gg0s <j2gg0s@gmail.com> Co-authored-by: Daniel Liu <139250065@qq.com> Co-authored-by: Jordan Krage <jmank88@gmail.com> Co-authored-by: Arran Schlosberg <519948+ARR4N@users.noreply.github.com> Co-authored-by: Nebojsa Urosevic <nebojsa94@users.noreply.github.com> Co-authored-by: Ng Wei Han <47109095+weiihann@users.noreply.github.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> Co-authored-by: steven <wangpeculiar@gmail.com> Co-authored-by: Zheyuan He <ecjgvmhc@gmail.com> Co-authored-by: Hteev Oli <gethorz@proton.me> Co-authored-by: Darren Kelly <107671032+darrenvechain@users.noreply.github.com> Co-authored-by: gitglorythegreat <t4juu3@proton.me> Co-authored-by: lorenzo <31852651+lorenzo-dev1@users.noreply.github.com> Co-authored-by: Antony Denyer <email@antonydenyer.co.uk> Co-authored-by: Lucas <lucaslg360@gmail.com> Co-authored-by: Mario Vega <marioevz@gmail.com> Co-authored-by: maskpp <maskpp266@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: かげ <47621124+ronething-bot@users.noreply.github.com> Co-authored-by: georgehao <haohongfan@gmail.com> Co-authored-by: Savely <136869149+savvar9991@users.noreply.github.com> Co-authored-by: Ceyhun Onur <ceyhun.onur@avalabs.org> Co-authored-by: Daniel Liu <liudaniel@qq.com> Co-authored-by: Martin Redmond <21436+reds@users.noreply.github.com> Co-authored-by: Martin <mrscdevel@gmail.com> Co-authored-by: dashangcun <907225865@qq.com> Co-authored-by: Quentin McGaw <quentin.mcgaw@gmail.com> Co-authored-by: Paul Lange <palango@users.noreply.github.com> Co-authored-by: Matthieu Vachon <matt@streamingfast.io> Co-authored-by: Cedrick <Cedrickentrep@gmail.com> Co-authored-by: Shude Li <islishude@gmail.com> Co-authored-by: levisyin <lilassherl@gmail.com> Co-authored-by: Danno Ferrin <danno@numisight.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Michael de Hoog <michael.dehoog@coinbase.com> Co-authored-by: zhen peng <505380967@qq.com> Co-authored-by: Christina <156356273+cratiu222@users.noreply.github.com> Co-authored-by: Ryan Tinianov <tinianov@live.com> Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: kazak <alright-epsilon8h@icloud.com> Co-authored-by: ericxtheodore <ericxtheodore@outlook.com> Co-authored-by: Marcin Sobczak <77129288+marcindsobczak@users.noreply.github.com> Co-authored-by: Harry Ngo <17699212+huyngopt1994@users.noreply.github.com> Co-authored-by: Chen Kai <281165273grape@gmail.com> Co-authored-by: minh-bq <minh.bui@skymavis.com> Co-authored-by: piersy <pierspowlesland@gmail.com> Co-authored-by: EdisonSR <61781882@qq.com> Co-authored-by: nethoxa <135072738+nethoxa@users.noreply.github.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: rrhlrmrr <39875249+rrhlrmrr@users.noreply.github.com> Co-authored-by: Maximilian Hubert <64627729+gap-editor@users.noreply.github.com> Co-authored-by: James <jamesstanleystewart@gmail.com> Co-authored-by: buddho <galaxystroller@gmail.com> Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org> Co-authored-by: Kuwon Sebastian Na <laggu91@gmail.com>
1437 lines
50 KiB
Go
1437 lines
50 KiB
Go
// Copyright 2014 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 state provides a caching layer atop the Ethereum state trie.
|
|
package state
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"maps"
|
|
"slices"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
"github.com/ethereum/go-ethereum/core/state/snapshot"
|
|
"github.com/ethereum/go-ethereum/core/stateless"
|
|
"github.com/ethereum/go-ethereum/core/tracing"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/params"
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
"github.com/ethereum/go-ethereum/trie/trienode"
|
|
"github.com/ethereum/go-ethereum/trie/utils"
|
|
"github.com/holiman/uint256"
|
|
"golang.org/x/sync/errgroup"
|
|
)
|
|
|
|
// TriesInMemory represents the number of layers that are kept in RAM.
|
|
const TriesInMemory = 128
|
|
|
|
type mutationType int
|
|
|
|
const (
|
|
update mutationType = iota
|
|
deletion
|
|
)
|
|
|
|
type mutation struct {
|
|
typ mutationType
|
|
applied bool
|
|
}
|
|
|
|
func (m *mutation) copy() *mutation {
|
|
return &mutation{typ: m.typ, applied: m.applied}
|
|
}
|
|
|
|
func (m *mutation) isDelete() bool {
|
|
return m.typ == deletion
|
|
}
|
|
|
|
// StateDB structs within the ethereum protocol are used to store anything
|
|
// within the merkle trie. StateDBs take care of caching and storing
|
|
// nested states. It's the general query interface to retrieve:
|
|
//
|
|
// * Contracts
|
|
// * Accounts
|
|
//
|
|
// Once the state is committed, tries cached in stateDB (including account
|
|
// trie, storage tries) will no longer be functional. A new state instance
|
|
// must be created with new root and updated database for accessing post-
|
|
// commit states.
|
|
type StateDB struct {
|
|
db Database
|
|
prefetcher *triePrefetcher
|
|
trie Trie
|
|
reader Reader
|
|
|
|
// originalRoot is the pre-state root, before any changes were made.
|
|
// It will be updated when the Commit is called.
|
|
originalRoot common.Hash
|
|
|
|
// This map holds 'live' objects, which will get modified while
|
|
// processing a state transition.
|
|
stateObjects map[common.Address]*stateObject
|
|
|
|
// This map holds 'deleted' objects. An object with the same address
|
|
// might also occur in the 'stateObjects' map due to account
|
|
// resurrection. The account value is tracked as the original value
|
|
// before the transition. This map is populated at the transaction
|
|
// boundaries.
|
|
stateObjectsDestruct map[common.Address]*stateObject
|
|
|
|
// This map tracks the account mutations that occurred during the
|
|
// transition. Uncommitted mutations belonging to the same account
|
|
// can be merged into a single one which is equivalent from database's
|
|
// perspective. This map is populated at the transaction boundaries.
|
|
mutations map[common.Address]*mutation
|
|
|
|
// DB error.
|
|
// State objects are used by the consensus core and VM which are
|
|
// unable to deal with database-level errors. Any error that occurs
|
|
// during a database read is memoized here and will eventually be
|
|
// returned by StateDB.Commit. Notably, this error is also shared
|
|
// by all cached state objects in case the database failure occurs
|
|
// when accessing state of accounts.
|
|
dbErr error
|
|
|
|
// The refund counter, also used by state transitioning.
|
|
refund uint64
|
|
|
|
// The tx context and all occurred logs in the scope of transaction.
|
|
thash common.Hash
|
|
txIndex int
|
|
logs map[common.Hash][]*types.Log
|
|
logSize uint
|
|
|
|
// Preimages occurred seen by VM in the scope of block.
|
|
preimages map[common.Hash][]byte
|
|
|
|
// Per-transaction access list
|
|
accessList *accessList
|
|
accessEvents *AccessEvents
|
|
|
|
// Transient storage
|
|
transientStorage transientStorage
|
|
|
|
// Journal of state modifications. This is the backbone of
|
|
// Snapshot and RevertToSnapshot.
|
|
journal *journal
|
|
|
|
// State witness if cross validation is needed
|
|
witness *stateless.Witness
|
|
|
|
// Measurements gathered during execution for debugging purposes
|
|
AccountReads time.Duration
|
|
AccountHashes time.Duration
|
|
AccountUpdates time.Duration
|
|
AccountCommits time.Duration
|
|
StorageReads time.Duration
|
|
StorageUpdates time.Duration
|
|
StorageCommits time.Duration
|
|
SnapshotCommits time.Duration
|
|
TrieDBCommits time.Duration
|
|
|
|
AccountLoaded int // Number of accounts retrieved from the database during the state transition
|
|
AccountUpdated int // Number of accounts updated during the state transition
|
|
AccountDeleted int // Number of accounts deleted during the state transition
|
|
StorageLoaded int // Number of storage slots retrieved from the database during the state transition
|
|
StorageUpdated atomic.Int64 // Number of storage slots updated during the state transition
|
|
StorageDeleted atomic.Int64 // Number of storage slots deleted during the state transition
|
|
}
|
|
|
|
// New creates a new state from a given trie.
|
|
func New(root common.Hash, db Database) (*StateDB, error) {
|
|
tr, err := db.OpenTrie(root)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
reader, err := db.Reader(root)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
sdb := &StateDB{
|
|
db: db,
|
|
trie: tr,
|
|
originalRoot: root,
|
|
reader: reader,
|
|
stateObjects: make(map[common.Address]*stateObject),
|
|
stateObjectsDestruct: make(map[common.Address]*stateObject),
|
|
mutations: make(map[common.Address]*mutation),
|
|
logs: make(map[common.Hash][]*types.Log),
|
|
preimages: make(map[common.Hash][]byte),
|
|
journal: newJournal(),
|
|
accessList: newAccessList(),
|
|
transientStorage: newTransientStorage(),
|
|
}
|
|
if db.TrieDB().IsVerkle() {
|
|
sdb.accessEvents = NewAccessEvents(db.PointCache())
|
|
}
|
|
return sdb, nil
|
|
}
|
|
|
|
// StartPrefetcher initializes a new trie prefetcher to pull in nodes from the
|
|
// state trie concurrently while the state is mutated so that when we reach the
|
|
// commit phase, most of the needed data is already hot.
|
|
func (s *StateDB) StartPrefetcher(namespace string, witness *stateless.Witness) {
|
|
// Terminate any previously running prefetcher
|
|
s.StopPrefetcher()
|
|
|
|
// Enable witness collection if requested
|
|
s.witness = witness
|
|
|
|
// With the switch to the Proof-of-Stake consensus algorithm, block production
|
|
// rewards are now handled at the consensus layer. Consequently, a block may
|
|
// have no state transitions if it contains no transactions and no withdrawals.
|
|
// In such cases, the account trie won't be scheduled for prefetching, leading
|
|
// to unnecessary error logs.
|
|
//
|
|
// To prevent this, the account trie is always scheduled for prefetching once
|
|
// the prefetcher is constructed. For more details, see:
|
|
// https://github.com/ethereum/go-ethereum/issues/29880
|
|
s.prefetcher = newTriePrefetcher(s.db, s.originalRoot, namespace, witness == nil)
|
|
if err := s.prefetcher.prefetch(common.Hash{}, s.originalRoot, common.Address{}, nil, nil, false); err != nil {
|
|
log.Error("Failed to prefetch account trie", "root", s.originalRoot, "err", err)
|
|
}
|
|
}
|
|
|
|
// StopPrefetcher terminates a running prefetcher and reports any leftover stats
|
|
// from the gathered metrics.
|
|
func (s *StateDB) StopPrefetcher() {
|
|
if s.prefetcher != nil {
|
|
s.prefetcher.terminate(false)
|
|
s.prefetcher.report()
|
|
s.prefetcher = nil
|
|
}
|
|
}
|
|
|
|
// setError remembers the first non-nil error it is called with.
|
|
func (s *StateDB) setError(err error) {
|
|
if s.dbErr == nil {
|
|
s.dbErr = err
|
|
}
|
|
}
|
|
|
|
// Error returns the memorized database failure occurred earlier.
|
|
func (s *StateDB) Error() error {
|
|
return s.dbErr
|
|
}
|
|
|
|
func (s *StateDB) AddLog(log *types.Log) {
|
|
s.journal.logChange(s.thash)
|
|
|
|
log.TxHash = s.thash
|
|
log.TxIndex = uint(s.txIndex)
|
|
log.Index = s.logSize
|
|
s.logs[s.thash] = append(s.logs[s.thash], log)
|
|
s.logSize++
|
|
}
|
|
|
|
// GetLogs returns the logs matching the specified transaction hash, and annotates
|
|
// them with the given blockNumber and blockHash.
|
|
func (s *StateDB) GetLogs(hash common.Hash, blockNumber uint64, blockHash common.Hash) []*types.Log {
|
|
logs := s.logs[hash]
|
|
for _, l := range logs {
|
|
l.BlockNumber = blockNumber
|
|
l.BlockHash = blockHash
|
|
}
|
|
return logs
|
|
}
|
|
|
|
func (s *StateDB) Logs() []*types.Log {
|
|
var logs []*types.Log
|
|
for _, lgs := range s.logs {
|
|
logs = append(logs, lgs...)
|
|
}
|
|
return logs
|
|
}
|
|
|
|
// AddPreimage records a SHA3 preimage seen by the VM.
|
|
func (s *StateDB) AddPreimage(hash common.Hash, preimage []byte) {
|
|
if _, ok := s.preimages[hash]; !ok {
|
|
s.preimages[hash] = slices.Clone(preimage)
|
|
}
|
|
}
|
|
|
|
// Preimages returns a list of SHA3 preimages that have been submitted.
|
|
func (s *StateDB) Preimages() map[common.Hash][]byte {
|
|
return s.preimages
|
|
}
|
|
|
|
// AddRefund adds gas to the refund counter
|
|
func (s *StateDB) AddRefund(gas uint64) {
|
|
s.journal.refundChange(s.refund)
|
|
s.refund += gas
|
|
}
|
|
|
|
// SubRefund removes gas from the refund counter.
|
|
// This method will panic if the refund counter goes below zero
|
|
func (s *StateDB) SubRefund(gas uint64) {
|
|
s.journal.refundChange(s.refund)
|
|
if gas > s.refund {
|
|
panic(fmt.Sprintf("Refund counter below zero (gas: %d > refund: %d)", gas, s.refund))
|
|
}
|
|
s.refund -= gas
|
|
}
|
|
|
|
// Exist reports whether the given account address exists in the state.
|
|
// Notably this also returns true for self-destructed accounts.
|
|
func (s *StateDB) Exist(addr common.Address) bool {
|
|
return s.getStateObject(addr) != nil
|
|
}
|
|
|
|
// Empty returns whether the state object is either non-existent
|
|
// or empty according to the EIP161 specification (balance = nonce = code = 0)
|
|
func (s *StateDB) Empty(addr common.Address) bool {
|
|
so := s.getStateObject(addr)
|
|
return so == nil || so.empty()
|
|
}
|
|
|
|
// GetBalance retrieves the balance from the given address or 0 if object not found
|
|
func (s *StateDB) GetBalance(addr common.Address) *uint256.Int {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.Balance()
|
|
}
|
|
return common.U2560
|
|
}
|
|
|
|
// GetNonce retrieves the nonce from the given address or 0 if object not found
|
|
func (s *StateDB) GetNonce(addr common.Address) uint64 {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.Nonce()
|
|
}
|
|
|
|
return 0
|
|
}
|
|
|
|
// GetStorageRoot retrieves the storage root from the given address or empty
|
|
// if object not found.
|
|
func (s *StateDB) GetStorageRoot(addr common.Address) common.Hash {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.Root()
|
|
}
|
|
return common.Hash{}
|
|
}
|
|
|
|
// TxIndex returns the current transaction index set by SetTxContext.
|
|
func (s *StateDB) TxIndex() int {
|
|
return s.txIndex
|
|
}
|
|
|
|
func (s *StateDB) GetCode(addr common.Address) []byte {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
if s.witness != nil {
|
|
s.witness.AddCode(stateObject.Code())
|
|
}
|
|
return stateObject.Code()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *StateDB) GetCodeSize(addr common.Address) int {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
if s.witness != nil {
|
|
s.witness.AddCode(stateObject.Code())
|
|
}
|
|
return stateObject.CodeSize()
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (s *StateDB) GetCodeHash(addr common.Address) common.Hash {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return common.BytesToHash(stateObject.CodeHash())
|
|
}
|
|
return common.Hash{}
|
|
}
|
|
|
|
// GetState retrieves the value associated with the specific key.
|
|
func (s *StateDB) GetState(addr common.Address, hash common.Hash) common.Hash {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.GetState(hash)
|
|
}
|
|
return common.Hash{}
|
|
}
|
|
|
|
// GetCommittedState retrieves the value associated with the specific key
|
|
// without any mutations caused in the current execution.
|
|
func (s *StateDB) GetCommittedState(addr common.Address, hash common.Hash) common.Hash {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.GetCommittedState(hash)
|
|
}
|
|
return common.Hash{}
|
|
}
|
|
|
|
// Database retrieves the low level database supporting the lower level trie ops.
|
|
func (s *StateDB) Database() Database {
|
|
return s.db
|
|
}
|
|
|
|
func (s *StateDB) HasSelfDestructed(addr common.Address) bool {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.selfDestructed
|
|
}
|
|
return false
|
|
}
|
|
|
|
/*
|
|
* SETTERS
|
|
*/
|
|
|
|
// AddBalance adds amount to the account associated with addr.
|
|
func (s *StateDB) AddBalance(addr common.Address, amount *uint256.Int, reason tracing.BalanceChangeReason) uint256.Int {
|
|
stateObject := s.getOrNewStateObject(addr)
|
|
if stateObject == nil {
|
|
return uint256.Int{}
|
|
}
|
|
return stateObject.AddBalance(amount)
|
|
}
|
|
|
|
// SubBalance subtracts amount from the account associated with addr.
|
|
func (s *StateDB) SubBalance(addr common.Address, amount *uint256.Int, reason tracing.BalanceChangeReason) uint256.Int {
|
|
stateObject := s.getOrNewStateObject(addr)
|
|
if stateObject == nil {
|
|
return uint256.Int{}
|
|
}
|
|
if amount.IsZero() {
|
|
return *(stateObject.Balance())
|
|
}
|
|
return stateObject.SetBalance(new(uint256.Int).Sub(stateObject.Balance(), amount))
|
|
}
|
|
|
|
func (s *StateDB) SetBalance(addr common.Address, amount *uint256.Int, reason tracing.BalanceChangeReason) {
|
|
stateObject := s.getOrNewStateObject(addr)
|
|
if stateObject != nil {
|
|
stateObject.SetBalance(amount)
|
|
}
|
|
}
|
|
|
|
func (s *StateDB) SetNonce(addr common.Address, nonce uint64, reason tracing.NonceChangeReason) {
|
|
stateObject := s.getOrNewStateObject(addr)
|
|
if stateObject != nil {
|
|
stateObject.SetNonce(nonce)
|
|
}
|
|
}
|
|
|
|
func (s *StateDB) SetCode(addr common.Address, code []byte) (prev []byte) {
|
|
stateObject := s.getOrNewStateObject(addr)
|
|
if stateObject != nil {
|
|
return stateObject.SetCode(crypto.Keccak256Hash(code), code)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *StateDB) SetState(addr common.Address, key, value common.Hash) common.Hash {
|
|
if stateObject := s.getOrNewStateObject(addr); stateObject != nil {
|
|
return stateObject.SetState(key, value)
|
|
}
|
|
return common.Hash{}
|
|
}
|
|
|
|
// SetStorage replaces the entire storage for the specified account with given
|
|
// storage. This function should only be used for debugging and the mutations
|
|
// must be discarded afterwards.
|
|
func (s *StateDB) SetStorage(addr common.Address, storage map[common.Hash]common.Hash) {
|
|
// SetStorage needs to wipe the existing storage. We achieve this by marking
|
|
// the account as self-destructed in this block. The effect is that storage
|
|
// lookups will not hit the disk, as it is assumed that the disk data belongs
|
|
// to a previous incarnation of the object.
|
|
//
|
|
// TODO (rjl493456442): This function should only be supported by 'unwritable'
|
|
// state, and all mutations made should be discarded afterward.
|
|
obj := s.getStateObject(addr)
|
|
if obj != nil {
|
|
if _, ok := s.stateObjectsDestruct[addr]; !ok {
|
|
s.stateObjectsDestruct[addr] = obj
|
|
}
|
|
}
|
|
newObj := s.createObject(addr)
|
|
for k, v := range storage {
|
|
newObj.SetState(k, v)
|
|
}
|
|
// Inherit the metadata of original object if it was existent
|
|
if obj != nil {
|
|
newObj.SetCode(common.BytesToHash(obj.CodeHash()), obj.code)
|
|
newObj.SetNonce(obj.Nonce())
|
|
newObj.SetBalance(obj.Balance())
|
|
}
|
|
}
|
|
|
|
// SelfDestruct marks the given account as selfdestructed.
|
|
// This clears the account balance.
|
|
//
|
|
// The account's state object is still available until the state is committed,
|
|
// getStateObject will return a non-nil account after SelfDestruct.
|
|
func (s *StateDB) SelfDestruct(addr common.Address) uint256.Int {
|
|
stateObject := s.getStateObject(addr)
|
|
var prevBalance uint256.Int
|
|
if stateObject == nil {
|
|
return prevBalance
|
|
}
|
|
prevBalance = *(stateObject.Balance())
|
|
// Regardless of whether it is already destructed or not, we do have to
|
|
// journal the balance-change, if we set it to zero here.
|
|
if !stateObject.Balance().IsZero() {
|
|
stateObject.SetBalance(new(uint256.Int))
|
|
}
|
|
// If it is already marked as self-destructed, we do not need to add it
|
|
// for journalling a second time.
|
|
if !stateObject.selfDestructed {
|
|
s.journal.destruct(addr)
|
|
stateObject.markSelfdestructed()
|
|
}
|
|
return prevBalance
|
|
}
|
|
|
|
func (s *StateDB) SelfDestruct6780(addr common.Address) (uint256.Int, bool) {
|
|
stateObject := s.getStateObject(addr)
|
|
if stateObject == nil {
|
|
return uint256.Int{}, false
|
|
}
|
|
if stateObject.newContract {
|
|
return s.SelfDestruct(addr), true
|
|
}
|
|
return *(stateObject.Balance()), false
|
|
}
|
|
|
|
// SetTransientState sets transient storage for a given account. It
|
|
// adds the change to the journal so that it can be rolled back
|
|
// to its previous value if there is a revert.
|
|
func (s *StateDB) SetTransientState(addr common.Address, key, value common.Hash) {
|
|
prev := s.GetTransientState(addr, key)
|
|
if prev == value {
|
|
return
|
|
}
|
|
s.journal.transientStateChange(addr, key, prev)
|
|
s.setTransientState(addr, key, value)
|
|
}
|
|
|
|
// setTransientState is a lower level setter for transient storage. It
|
|
// is called during a revert to prevent modifications to the journal.
|
|
func (s *StateDB) setTransientState(addr common.Address, key, value common.Hash) {
|
|
s.transientStorage.Set(addr, key, value)
|
|
}
|
|
|
|
// GetTransientState gets transient storage for a given account.
|
|
func (s *StateDB) GetTransientState(addr common.Address, key common.Hash) common.Hash {
|
|
return s.transientStorage.Get(addr, key)
|
|
}
|
|
|
|
//
|
|
// Setting, updating & deleting state object methods.
|
|
//
|
|
|
|
// updateStateObject writes the given object to the trie.
|
|
func (s *StateDB) updateStateObject(obj *stateObject) {
|
|
// Encode the account and update the account trie
|
|
addr := obj.Address()
|
|
if err := s.trie.UpdateAccount(addr, &obj.data, len(obj.code)); err != nil {
|
|
s.setError(fmt.Errorf("updateStateObject (%x) error: %v", addr[:], err))
|
|
}
|
|
if obj.dirtyCode {
|
|
s.trie.UpdateContractCode(obj.Address(), common.BytesToHash(obj.CodeHash()), obj.code)
|
|
}
|
|
}
|
|
|
|
// deleteStateObject removes the given object from the state trie.
|
|
func (s *StateDB) deleteStateObject(addr common.Address) {
|
|
if err := s.trie.DeleteAccount(addr); err != nil {
|
|
s.setError(fmt.Errorf("deleteStateObject (%x) error: %v", addr[:], err))
|
|
}
|
|
}
|
|
|
|
// getStateObject retrieves a state object given by the address, returning nil if
|
|
// the object is not found or was deleted in this execution context.
|
|
func (s *StateDB) getStateObject(addr common.Address) *stateObject {
|
|
// Prefer live objects if any is available
|
|
if obj := s.stateObjects[addr]; obj != nil {
|
|
return obj
|
|
}
|
|
// Short circuit if the account is already destructed in this block.
|
|
if _, ok := s.stateObjectsDestruct[addr]; ok {
|
|
return nil
|
|
}
|
|
s.AccountLoaded++
|
|
|
|
start := time.Now()
|
|
acct, err := s.reader.Account(addr)
|
|
if err != nil {
|
|
s.setError(fmt.Errorf("getStateObject (%x) error: %w", addr.Bytes(), err))
|
|
return nil
|
|
}
|
|
s.AccountReads += time.Since(start)
|
|
|
|
// Short circuit if the account is not found
|
|
if acct == nil {
|
|
return nil
|
|
}
|
|
// Schedule the resolved account for prefetching if it's enabled.
|
|
if s.prefetcher != nil {
|
|
if err = s.prefetcher.prefetch(common.Hash{}, s.originalRoot, common.Address{}, []common.Address{addr}, nil, true); err != nil {
|
|
log.Error("Failed to prefetch account", "addr", addr, "err", err)
|
|
}
|
|
}
|
|
// Insert into the live set
|
|
obj := newObject(s, addr, acct)
|
|
s.setStateObject(obj)
|
|
s.AccountLoaded++
|
|
return obj
|
|
}
|
|
|
|
func (s *StateDB) setStateObject(object *stateObject) {
|
|
s.stateObjects[object.Address()] = object
|
|
}
|
|
|
|
// getOrNewStateObject retrieves a state object or create a new state object if nil.
|
|
func (s *StateDB) getOrNewStateObject(addr common.Address) *stateObject {
|
|
obj := s.getStateObject(addr)
|
|
if obj == nil {
|
|
obj = s.createObject(addr)
|
|
}
|
|
return obj
|
|
}
|
|
|
|
// createObject creates a new state object. The assumption is held there is no
|
|
// existing account with the given address, otherwise it will be silently overwritten.
|
|
func (s *StateDB) createObject(addr common.Address) *stateObject {
|
|
obj := newObject(s, addr, nil)
|
|
s.journal.createObject(addr)
|
|
s.setStateObject(obj)
|
|
return obj
|
|
}
|
|
|
|
// CreateAccount explicitly creates a new state object, assuming that the
|
|
// account did not previously exist in the state. If the account already
|
|
// exists, this function will silently overwrite it which might lead to a
|
|
// consensus bug eventually.
|
|
func (s *StateDB) CreateAccount(addr common.Address) {
|
|
s.createObject(addr)
|
|
}
|
|
|
|
// CreateContract is used whenever a contract is created. This may be preceded
|
|
// by CreateAccount, but that is not required if it already existed in the
|
|
// state due to funds sent beforehand.
|
|
// This operation sets the 'newContract'-flag, which is required in order to
|
|
// correctly handle EIP-6780 'delete-in-same-transaction' logic.
|
|
func (s *StateDB) CreateContract(addr common.Address) {
|
|
obj := s.getStateObject(addr)
|
|
if !obj.newContract {
|
|
obj.newContract = true
|
|
s.journal.createContract(addr)
|
|
}
|
|
}
|
|
|
|
// Copy creates a deep, independent copy of the state.
|
|
// Snapshots of the copied state cannot be applied to the copy.
|
|
func (s *StateDB) Copy() *StateDB {
|
|
// Copy all the basic fields, initialize the memory ones
|
|
reader, _ := s.db.Reader(s.originalRoot) // impossible to fail
|
|
state := &StateDB{
|
|
db: s.db,
|
|
trie: mustCopyTrie(s.trie),
|
|
reader: reader,
|
|
originalRoot: s.originalRoot,
|
|
stateObjects: make(map[common.Address]*stateObject, len(s.stateObjects)),
|
|
stateObjectsDestruct: make(map[common.Address]*stateObject, len(s.stateObjectsDestruct)),
|
|
mutations: make(map[common.Address]*mutation, len(s.mutations)),
|
|
dbErr: s.dbErr,
|
|
refund: s.refund,
|
|
thash: s.thash,
|
|
txIndex: s.txIndex,
|
|
logs: make(map[common.Hash][]*types.Log, len(s.logs)),
|
|
logSize: s.logSize,
|
|
preimages: maps.Clone(s.preimages),
|
|
|
|
// Do we need to copy the access list and transient storage?
|
|
// In practice: No. At the start of a transaction, these two lists are empty.
|
|
// In practice, we only ever copy state _between_ transactions/blocks, never
|
|
// in the middle of a transaction. However, it doesn't cost us much to copy
|
|
// empty lists, so we do it anyway to not blow up if we ever decide copy them
|
|
// in the middle of a transaction.
|
|
accessList: s.accessList.Copy(),
|
|
transientStorage: s.transientStorage.Copy(),
|
|
journal: s.journal.copy(),
|
|
}
|
|
if s.witness != nil {
|
|
state.witness = s.witness.Copy()
|
|
}
|
|
if s.accessEvents != nil {
|
|
state.accessEvents = s.accessEvents.Copy()
|
|
}
|
|
// Deep copy cached state objects.
|
|
for addr, obj := range s.stateObjects {
|
|
state.stateObjects[addr] = obj.deepCopy(state)
|
|
}
|
|
// Deep copy destructed state objects.
|
|
for addr, obj := range s.stateObjectsDestruct {
|
|
state.stateObjectsDestruct[addr] = obj.deepCopy(state)
|
|
}
|
|
// Deep copy the object state markers.
|
|
for addr, op := range s.mutations {
|
|
state.mutations[addr] = op.copy()
|
|
}
|
|
// Deep copy the logs occurred in the scope of block
|
|
for hash, logs := range s.logs {
|
|
cpy := make([]*types.Log, len(logs))
|
|
for i, l := range logs {
|
|
cpy[i] = new(types.Log)
|
|
*cpy[i] = *l
|
|
}
|
|
state.logs[hash] = cpy
|
|
}
|
|
return state
|
|
}
|
|
|
|
// Snapshot returns an identifier for the current revision of the state.
|
|
func (s *StateDB) Snapshot() int {
|
|
return s.journal.snapshot()
|
|
}
|
|
|
|
// RevertToSnapshot reverts all state changes made since the given revision.
|
|
func (s *StateDB) RevertToSnapshot(revid int) {
|
|
s.journal.revertToSnapshot(revid, s)
|
|
}
|
|
|
|
// GetRefund returns the current value of the refund counter.
|
|
func (s *StateDB) GetRefund() uint64 {
|
|
return s.refund
|
|
}
|
|
|
|
// Finalise finalises the state by removing the destructed objects and clears
|
|
// the journal as well as the refunds. Finalise, however, will not push any updates
|
|
// into the tries just yet. Only IntermediateRoot or Commit will do that.
|
|
func (s *StateDB) Finalise(deleteEmptyObjects bool) {
|
|
addressesToPrefetch := make([]common.Address, 0, len(s.journal.dirties))
|
|
for addr := range s.journal.dirties {
|
|
obj, exist := s.stateObjects[addr]
|
|
if !exist {
|
|
// ripeMD is 'touched' at block 1714175, in tx 0x1237f737031e40bcde4a8b7e717b2d15e3ecadfe49bb1bbc71ee9deb09c6fcf2
|
|
// That tx goes out of gas, and although the notion of 'touched' does not exist there, the
|
|
// touch-event will still be recorded in the journal. Since ripeMD is a special snowflake,
|
|
// it will persist in the journal even though the journal is reverted. In this special circumstance,
|
|
// it may exist in `s.journal.dirties` but not in `s.stateObjects`.
|
|
// Thus, we can safely ignore it here
|
|
continue
|
|
}
|
|
if obj.selfDestructed || (deleteEmptyObjects && obj.empty()) {
|
|
delete(s.stateObjects, obj.address)
|
|
s.markDelete(addr)
|
|
// We need to maintain account deletions explicitly (will remain
|
|
// set indefinitely). Note only the first occurred self-destruct
|
|
// event is tracked.
|
|
if _, ok := s.stateObjectsDestruct[obj.address]; !ok {
|
|
s.stateObjectsDestruct[obj.address] = obj
|
|
}
|
|
} else {
|
|
obj.finalise()
|
|
s.markUpdate(addr)
|
|
}
|
|
// At this point, also ship the address off to the precacher. The precacher
|
|
// will start loading tries, and when the change is eventually committed,
|
|
// the commit-phase will be a lot faster
|
|
addressesToPrefetch = append(addressesToPrefetch, addr) // Copy needed for closure
|
|
}
|
|
if s.prefetcher != nil && len(addressesToPrefetch) > 0 {
|
|
if err := s.prefetcher.prefetch(common.Hash{}, s.originalRoot, common.Address{}, addressesToPrefetch, nil, false); err != nil {
|
|
log.Error("Failed to prefetch addresses", "addresses", len(addressesToPrefetch), "err", err)
|
|
}
|
|
}
|
|
// Invalidate journal because reverting across transactions is not allowed.
|
|
s.clearJournalAndRefund()
|
|
}
|
|
|
|
// IntermediateRoot computes the current root hash of the state trie.
|
|
// It is called in between transactions to get the root hash that
|
|
// goes into transaction receipts.
|
|
func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
|
|
// Finalise all the dirty storage states and write them into the tries
|
|
s.Finalise(deleteEmptyObjects)
|
|
|
|
// If there was a trie prefetcher operating, terminate it async so that the
|
|
// individual storage tries can be updated as soon as the disk load finishes.
|
|
if s.prefetcher != nil {
|
|
s.prefetcher.terminate(true)
|
|
defer func() {
|
|
s.prefetcher.report()
|
|
s.prefetcher = nil // Pre-byzantium, unset any used up prefetcher
|
|
}()
|
|
}
|
|
// Process all storage updates concurrently. The state object update root
|
|
// method will internally call a blocking trie fetch from the prefetcher,
|
|
// so there's no need to explicitly wait for the prefetchers to finish.
|
|
var (
|
|
start = time.Now()
|
|
workers errgroup.Group
|
|
)
|
|
if s.db.TrieDB().IsVerkle() {
|
|
// Whilst MPT storage tries are independent, Verkle has one single trie
|
|
// for all the accounts and all the storage slots merged together. The
|
|
// former can thus be simply parallelized, but updating the latter will
|
|
// need concurrency support within the trie itself. That's a TODO for a
|
|
// later time.
|
|
workers.SetLimit(1)
|
|
}
|
|
for addr, op := range s.mutations {
|
|
if op.applied || op.isDelete() {
|
|
continue
|
|
}
|
|
obj := s.stateObjects[addr] // closure for the task runner below
|
|
workers.Go(func() error {
|
|
if s.db.TrieDB().IsVerkle() {
|
|
obj.updateTrie()
|
|
} else {
|
|
obj.updateRoot()
|
|
|
|
// If witness building is enabled and the state object has a trie,
|
|
// gather the witnesses for its specific storage trie
|
|
if s.witness != nil && obj.trie != nil {
|
|
s.witness.AddState(obj.trie.Witness())
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
// If witness building is enabled, gather all the read-only accesses.
|
|
// Skip witness collection in Verkle mode, they will be gathered
|
|
// together at the end.
|
|
if s.witness != nil && !s.db.TrieDB().IsVerkle() {
|
|
// Pull in anything that has been accessed before destruction
|
|
for _, obj := range s.stateObjectsDestruct {
|
|
// Skip any objects that haven't touched their storage
|
|
if len(obj.originStorage) == 0 {
|
|
continue
|
|
}
|
|
if trie := obj.getPrefetchedTrie(); trie != nil {
|
|
s.witness.AddState(trie.Witness())
|
|
} else if obj.trie != nil {
|
|
s.witness.AddState(obj.trie.Witness())
|
|
}
|
|
}
|
|
// Pull in only-read and non-destructed trie witnesses
|
|
for _, obj := range s.stateObjects {
|
|
// Skip any objects that have been updated
|
|
if _, ok := s.mutations[obj.address]; ok {
|
|
continue
|
|
}
|
|
// Skip any objects that haven't touched their storage
|
|
if len(obj.originStorage) == 0 {
|
|
continue
|
|
}
|
|
if trie := obj.getPrefetchedTrie(); trie != nil {
|
|
s.witness.AddState(trie.Witness())
|
|
} else if obj.trie != nil {
|
|
s.witness.AddState(obj.trie.Witness())
|
|
}
|
|
}
|
|
}
|
|
workers.Wait()
|
|
s.StorageUpdates += time.Since(start)
|
|
|
|
// Now we're about to start to write changes to the trie. The trie is so far
|
|
// _untouched_. We can check with the prefetcher, if it can give us a trie
|
|
// which has the same root, but also has some content loaded into it.
|
|
//
|
|
// Don't check prefetcher if verkle trie has been used. In the context of verkle,
|
|
// only a single trie is used for state hashing. Replacing a non-nil verkle tree
|
|
// here could result in losing uncommitted changes from storage.
|
|
start = time.Now()
|
|
if s.prefetcher != nil {
|
|
if trie := s.prefetcher.trie(common.Hash{}, s.originalRoot); trie == nil {
|
|
log.Error("Failed to retrieve account pre-fetcher trie")
|
|
} else {
|
|
s.trie = trie
|
|
}
|
|
}
|
|
// Perform updates before deletions. This prevents resolution of unnecessary trie nodes
|
|
// in circumstances similar to the following:
|
|
//
|
|
// Consider nodes `A` and `B` who share the same full node parent `P` and have no other siblings.
|
|
// During the execution of a block:
|
|
// - `A` self-destructs,
|
|
// - `C` is created, and also shares the parent `P`.
|
|
// If the self-destruct is handled first, then `P` would be left with only one child, thus collapsed
|
|
// into a shortnode. This requires `B` to be resolved from disk.
|
|
// Whereas if the created node is handled first, then the collapse is avoided, and `B` is not resolved.
|
|
var (
|
|
usedAddrs []common.Address
|
|
deletedAddrs []common.Address
|
|
)
|
|
for addr, op := range s.mutations {
|
|
if op.applied {
|
|
continue
|
|
}
|
|
op.applied = true
|
|
|
|
if op.isDelete() {
|
|
deletedAddrs = append(deletedAddrs, addr)
|
|
} else {
|
|
s.updateStateObject(s.stateObjects[addr])
|
|
s.AccountUpdated += 1
|
|
}
|
|
usedAddrs = append(usedAddrs, addr) // Copy needed for closure
|
|
}
|
|
for _, deletedAddr := range deletedAddrs {
|
|
s.deleteStateObject(deletedAddr)
|
|
s.AccountDeleted += 1
|
|
}
|
|
s.AccountUpdates += time.Since(start)
|
|
|
|
if s.prefetcher != nil {
|
|
s.prefetcher.used(common.Hash{}, s.originalRoot, usedAddrs, nil)
|
|
}
|
|
// Track the amount of time wasted on hashing the account trie
|
|
defer func(start time.Time) { s.AccountHashes += time.Since(start) }(time.Now())
|
|
|
|
hash := s.trie.Hash()
|
|
|
|
// If witness building is enabled, gather the account trie witness
|
|
if s.witness != nil {
|
|
s.witness.AddState(s.trie.Witness())
|
|
}
|
|
return hash
|
|
}
|
|
|
|
// SetTxContext sets the current transaction hash and index which are
|
|
// used when the EVM emits new state logs. It should be invoked before
|
|
// transaction execution.
|
|
func (s *StateDB) SetTxContext(thash common.Hash, ti int) {
|
|
s.thash = thash
|
|
s.txIndex = ti
|
|
}
|
|
|
|
func (s *StateDB) clearJournalAndRefund() {
|
|
s.journal.reset()
|
|
s.refund = 0
|
|
}
|
|
|
|
// fastDeleteStorage is the function that efficiently deletes the storage trie
|
|
// of a specific account. It leverages the associated state snapshot for fast
|
|
// storage iteration and constructs trie node deletion markers by creating
|
|
// stack trie with iterated slots.
|
|
func (s *StateDB) fastDeleteStorage(snaps *snapshot.Tree, addrHash common.Hash, root common.Hash) (map[common.Hash][]byte, map[common.Hash][]byte, *trienode.NodeSet, error) {
|
|
iter, err := snaps.StorageIterator(s.originalRoot, addrHash, common.Hash{})
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
defer iter.Release()
|
|
|
|
var (
|
|
nodes = trienode.NewNodeSet(addrHash) // the set for trie node mutations (value is nil)
|
|
storages = make(map[common.Hash][]byte) // the set for storage mutations (value is nil)
|
|
storageOrigins = make(map[common.Hash][]byte) // the set for tracking the original value of slot
|
|
)
|
|
stack := trie.NewStackTrie(func(path []byte, hash common.Hash, blob []byte) {
|
|
nodes.AddNode(path, trienode.NewDeleted())
|
|
})
|
|
for iter.Next() {
|
|
slot := common.CopyBytes(iter.Slot())
|
|
if err := iter.Error(); err != nil { // error might occur after Slot function
|
|
return nil, nil, nil, err
|
|
}
|
|
key := iter.Hash()
|
|
storages[key] = nil
|
|
storageOrigins[key] = slot
|
|
|
|
if err := stack.Update(key.Bytes(), slot); err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
}
|
|
if err := iter.Error(); err != nil { // error might occur during iteration
|
|
return nil, nil, nil, err
|
|
}
|
|
if stack.Hash() != root {
|
|
return nil, nil, nil, fmt.Errorf("snapshot is not matched, exp %x, got %x", root, stack.Hash())
|
|
}
|
|
return storages, storageOrigins, nodes, nil
|
|
}
|
|
|
|
// slowDeleteStorage serves as a less-efficient alternative to "fastDeleteStorage,"
|
|
// employed when the associated state snapshot is not available. It iterates the
|
|
// storage slots along with all internal trie nodes via trie directly.
|
|
func (s *StateDB) slowDeleteStorage(addr common.Address, addrHash common.Hash, root common.Hash) (map[common.Hash][]byte, map[common.Hash][]byte, *trienode.NodeSet, error) {
|
|
tr, err := s.db.OpenStorageTrie(s.originalRoot, addr, root, s.trie)
|
|
if err != nil {
|
|
return nil, nil, nil, fmt.Errorf("failed to open storage trie, err: %w", err)
|
|
}
|
|
it, err := tr.NodeIterator(nil)
|
|
if err != nil {
|
|
return nil, nil, nil, fmt.Errorf("failed to open storage iterator, err: %w", err)
|
|
}
|
|
var (
|
|
nodes = trienode.NewNodeSet(addrHash) // the set for trie node mutations (value is nil)
|
|
storages = make(map[common.Hash][]byte) // the set for storage mutations (value is nil)
|
|
storageOrigins = make(map[common.Hash][]byte) // the set for tracking the original value of slot
|
|
)
|
|
for it.Next(true) {
|
|
if it.Leaf() {
|
|
key := common.BytesToHash(it.LeafKey())
|
|
storages[key] = nil
|
|
storageOrigins[key] = common.CopyBytes(it.LeafBlob())
|
|
continue
|
|
}
|
|
if it.Hash() == (common.Hash{}) {
|
|
continue
|
|
}
|
|
nodes.AddNode(it.Path(), trienode.NewDeleted())
|
|
}
|
|
if err := it.Error(); err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
return storages, storageOrigins, nodes, nil
|
|
}
|
|
|
|
// deleteStorage is designed to delete the storage trie of a designated account.
|
|
// The function will make an attempt to utilize an efficient strategy if the
|
|
// associated state snapshot is reachable; otherwise, it will resort to a less
|
|
// efficient approach.
|
|
func (s *StateDB) deleteStorage(addr common.Address, addrHash common.Hash, root common.Hash) (map[common.Hash][]byte, map[common.Hash][]byte, *trienode.NodeSet, error) {
|
|
var (
|
|
err error
|
|
nodes *trienode.NodeSet // the set for trie node mutations (value is nil)
|
|
storages map[common.Hash][]byte // the set for storage mutations (value is nil)
|
|
storageOrigins map[common.Hash][]byte // the set for tracking the original value of slot
|
|
)
|
|
// The fast approach can be failed if the snapshot is not fully
|
|
// generated, or it's internally corrupted. Fallback to the slow
|
|
// one just in case.
|
|
snaps := s.db.Snapshot()
|
|
if snaps != nil {
|
|
storages, storageOrigins, nodes, err = s.fastDeleteStorage(snaps, addrHash, root)
|
|
}
|
|
if snaps == nil || err != nil {
|
|
storages, storageOrigins, nodes, err = s.slowDeleteStorage(addr, addrHash, root)
|
|
}
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
return storages, storageOrigins, nodes, nil
|
|
}
|
|
|
|
// handleDestruction processes all destruction markers and deletes the account
|
|
// and associated storage slots if necessary. There are four potential scenarios
|
|
// as following:
|
|
//
|
|
// (a) the account was not existent and be marked as destructed
|
|
// (b) the account was not existent and be marked as destructed,
|
|
// however, it's resurrected later in the same block.
|
|
// (c) the account was existent and be marked as destructed
|
|
// (d) the account was existent and be marked as destructed,
|
|
// however it's resurrected later in the same block.
|
|
//
|
|
// In case (a), nothing needs be deleted, nil to nil transition can be ignored.
|
|
// In case (b), nothing needs be deleted, nil is used as the original value for
|
|
// newly created account and storages
|
|
// In case (c), **original** account along with its storages should be deleted,
|
|
// with their values be tracked as original value.
|
|
// In case (d), **original** account along with its storages should be deleted,
|
|
// with their values be tracked as original value.
|
|
func (s *StateDB) handleDestruction(noStorageWiping bool) (map[common.Hash]*accountDelete, []*trienode.NodeSet, error) {
|
|
var (
|
|
nodes []*trienode.NodeSet
|
|
buf = crypto.NewKeccakState()
|
|
deletes = make(map[common.Hash]*accountDelete)
|
|
)
|
|
for addr, prevObj := range s.stateObjectsDestruct {
|
|
prev := prevObj.origin
|
|
|
|
// The account was non-existent, and it's marked as destructed in the scope
|
|
// of block. It can be either case (a) or (b) and will be interpreted as
|
|
// null->null state transition.
|
|
// - for (a), skip it without doing anything
|
|
// - for (b), the resurrected account with nil as original will be handled afterwards
|
|
if prev == nil {
|
|
continue
|
|
}
|
|
// The account was existent, it can be either case (c) or (d).
|
|
addrHash := crypto.HashData(buf, addr.Bytes())
|
|
op := &accountDelete{
|
|
address: addr,
|
|
origin: types.SlimAccountRLP(*prev),
|
|
}
|
|
deletes[addrHash] = op
|
|
|
|
// Short circuit if the origin storage was empty.
|
|
if prev.Root == types.EmptyRootHash || s.db.TrieDB().IsVerkle() {
|
|
continue
|
|
}
|
|
if noStorageWiping {
|
|
return nil, nil, fmt.Errorf("unexpected storage wiping, %x", addr)
|
|
}
|
|
// Remove storage slots belonging to the account.
|
|
storages, storagesOrigin, set, err := s.deleteStorage(addr, addrHash, prev.Root)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to delete storage, err: %w", err)
|
|
}
|
|
op.storages = storages
|
|
op.storagesOrigin = storagesOrigin
|
|
|
|
// Aggregate the associated trie node changes.
|
|
nodes = append(nodes, set)
|
|
}
|
|
return deletes, nodes, nil
|
|
}
|
|
|
|
// GetTrie returns the account trie.
|
|
func (s *StateDB) GetTrie() Trie {
|
|
return s.trie
|
|
}
|
|
|
|
// commit gathers the state mutations accumulated along with the associated
|
|
// trie changes, resetting all internal flags with the new state as the base.
|
|
func (s *StateDB) commit(deleteEmptyObjects bool, noStorageWiping bool) (*stateUpdate, error) {
|
|
// Short circuit in case any database failure occurred earlier.
|
|
if s.dbErr != nil {
|
|
return nil, fmt.Errorf("commit aborted due to earlier error: %v", s.dbErr)
|
|
}
|
|
// Finalize any pending changes and merge everything into the tries
|
|
s.IntermediateRoot(deleteEmptyObjects)
|
|
|
|
// Short circuit if any error occurs within the IntermediateRoot.
|
|
if s.dbErr != nil {
|
|
return nil, fmt.Errorf("commit aborted due to database error: %v", s.dbErr)
|
|
}
|
|
// Commit objects to the trie, measuring the elapsed time
|
|
var (
|
|
accountTrieNodesUpdated int
|
|
accountTrieNodesDeleted int
|
|
storageTrieNodesUpdated int
|
|
storageTrieNodesDeleted int
|
|
|
|
lock sync.Mutex // protect two maps below
|
|
nodes = trienode.NewMergedNodeSet() // aggregated trie nodes
|
|
updates = make(map[common.Hash]*accountUpdate, len(s.mutations)) // aggregated account updates
|
|
|
|
// merge aggregates the dirty trie nodes into the global set.
|
|
//
|
|
// Given that some accounts may be destroyed and then recreated within
|
|
// the same block, it's possible that a node set with the same owner
|
|
// may already exists. In such cases, these two sets are combined, with
|
|
// the later one overwriting the previous one if any nodes are modified
|
|
// or deleted in both sets.
|
|
//
|
|
// merge run concurrently across all the state objects and account trie.
|
|
merge = func(set *trienode.NodeSet) error {
|
|
if set == nil {
|
|
return nil
|
|
}
|
|
lock.Lock()
|
|
defer lock.Unlock()
|
|
|
|
updates, deletes := set.Size()
|
|
if set.Owner == (common.Hash{}) {
|
|
accountTrieNodesUpdated += updates
|
|
accountTrieNodesDeleted += deletes
|
|
} else {
|
|
storageTrieNodesUpdated += updates
|
|
storageTrieNodesDeleted += deletes
|
|
}
|
|
return nodes.Merge(set)
|
|
}
|
|
)
|
|
// Given that some accounts could be destroyed and then recreated within
|
|
// the same block, account deletions must be processed first. This ensures
|
|
// that the storage trie nodes deleted during destruction and recreated
|
|
// during subsequent resurrection can be combined correctly.
|
|
deletes, delNodes, err := s.handleDestruction(noStorageWiping)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, set := range delNodes {
|
|
if err := merge(set); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
// Handle all state updates afterwards, concurrently to one another to shave
|
|
// off some milliseconds from the commit operation. Also accumulate the code
|
|
// writes to run in parallel with the computations.
|
|
var (
|
|
start = time.Now()
|
|
root common.Hash
|
|
workers errgroup.Group
|
|
)
|
|
// Schedule the account trie first since that will be the biggest, so give
|
|
// it the most time to crunch.
|
|
//
|
|
// TODO(karalabe): This account trie commit is *very* heavy. 5-6ms at chain
|
|
// heads, which seems excessive given that it doesn't do hashing, it just
|
|
// shuffles some data. For comparison, the *hashing* at chain head is 2-3ms.
|
|
// We need to investigate what's happening as it seems something's wonky.
|
|
// Obviously it's not an end of the world issue, just something the original
|
|
// code didn't anticipate for.
|
|
workers.Go(func() error {
|
|
// Write the account trie changes, measuring the amount of wasted time
|
|
newroot, set := s.trie.Commit(true)
|
|
root = newroot
|
|
|
|
if err := merge(set); err != nil {
|
|
return err
|
|
}
|
|
s.AccountCommits = time.Since(start)
|
|
return nil
|
|
})
|
|
// Schedule each of the storage tries that need to be updated, so they can
|
|
// run concurrently to one another.
|
|
//
|
|
// TODO(karalabe): Experimentally, the account commit takes approximately the
|
|
// same time as all the storage commits combined, so we could maybe only have
|
|
// 2 threads in total. But that kind of depends on the account commit being
|
|
// more expensive than it should be, so let's fix that and revisit this todo.
|
|
for addr, op := range s.mutations {
|
|
if op.isDelete() {
|
|
continue
|
|
}
|
|
// Write any contract code associated with the state object
|
|
obj := s.stateObjects[addr]
|
|
if obj == nil {
|
|
return nil, errors.New("missing state object")
|
|
}
|
|
// Run the storage updates concurrently to one another
|
|
workers.Go(func() error {
|
|
// Write any storage changes in the state object to its storage trie
|
|
update, set, err := obj.commit()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := merge(set); err != nil {
|
|
return err
|
|
}
|
|
lock.Lock()
|
|
updates[obj.addrHash] = update
|
|
s.StorageCommits = time.Since(start) // overwrite with the longest storage commit runtime
|
|
lock.Unlock()
|
|
return nil
|
|
})
|
|
}
|
|
// Wait for everything to finish and update the metrics
|
|
if err := workers.Wait(); err != nil {
|
|
return nil, err
|
|
}
|
|
accountReadMeters.Mark(int64(s.AccountLoaded))
|
|
storageReadMeters.Mark(int64(s.StorageLoaded))
|
|
accountUpdatedMeter.Mark(int64(s.AccountUpdated))
|
|
storageUpdatedMeter.Mark(s.StorageUpdated.Load())
|
|
accountDeletedMeter.Mark(int64(s.AccountDeleted))
|
|
storageDeletedMeter.Mark(s.StorageDeleted.Load())
|
|
accountTrieUpdatedMeter.Mark(int64(accountTrieNodesUpdated))
|
|
accountTrieDeletedMeter.Mark(int64(accountTrieNodesDeleted))
|
|
storageTriesUpdatedMeter.Mark(int64(storageTrieNodesUpdated))
|
|
storageTriesDeletedMeter.Mark(int64(storageTrieNodesDeleted))
|
|
|
|
// Clear the metric markers
|
|
s.AccountLoaded, s.AccountUpdated, s.AccountDeleted = 0, 0, 0
|
|
s.StorageLoaded = 0
|
|
s.StorageUpdated.Store(0)
|
|
s.StorageDeleted.Store(0)
|
|
|
|
// Clear all internal flags and update state root at the end.
|
|
s.mutations = make(map[common.Address]*mutation)
|
|
s.stateObjectsDestruct = make(map[common.Address]*stateObject)
|
|
|
|
origin := s.originalRoot
|
|
s.originalRoot = root
|
|
|
|
return newStateUpdate(noStorageWiping, origin, root, deletes, updates, nodes), nil
|
|
}
|
|
|
|
// commitAndFlush is a wrapper of commit which also commits the state mutations
|
|
// to the configured data stores.
|
|
func (s *StateDB) commitAndFlush(block uint64, deleteEmptyObjects bool, noStorageWiping bool) (*stateUpdate, error) {
|
|
ret, err := s.commit(deleteEmptyObjects, noStorageWiping)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Commit dirty contract code if any exists
|
|
if db := s.db.TrieDB().Disk(); db != nil && len(ret.codes) > 0 {
|
|
batch := db.NewBatch()
|
|
for _, code := range ret.codes {
|
|
rawdb.WriteCode(batch, code.hash, code.blob)
|
|
}
|
|
if err := batch.Write(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if !ret.empty() {
|
|
// If snapshotting is enabled, update the snapshot tree with this new version
|
|
if snap := s.db.Snapshot(); snap != nil && snap.Snapshot(ret.originRoot) != nil {
|
|
start := time.Now()
|
|
if err := snap.Update(ret.root, ret.originRoot, ret.accounts, ret.storages); err != nil {
|
|
log.Warn("Failed to update snapshot tree", "from", ret.originRoot, "to", ret.root, "err", err)
|
|
}
|
|
// Keep 128 diff layers in the memory, persistent layer is 129th.
|
|
// - head layer is paired with HEAD state
|
|
// - head-1 layer is paired with HEAD-1 state
|
|
// - head-127 layer(bottom-most diff layer) is paired with HEAD-127 state
|
|
if err := snap.Cap(ret.root, TriesInMemory); err != nil {
|
|
log.Warn("Failed to cap snapshot tree", "root", ret.root, "layers", TriesInMemory, "err", err)
|
|
}
|
|
s.SnapshotCommits += time.Since(start)
|
|
}
|
|
// If trie database is enabled, commit the state update as a new layer
|
|
if db := s.db.TrieDB(); db != nil {
|
|
start := time.Now()
|
|
if err := db.Update(ret.root, ret.originRoot, block, ret.nodes, ret.stateSet()); err != nil {
|
|
return nil, err
|
|
}
|
|
s.TrieDBCommits += time.Since(start)
|
|
}
|
|
}
|
|
s.reader, _ = s.db.Reader(s.originalRoot)
|
|
return ret, err
|
|
}
|
|
|
|
// Commit writes the state mutations into the configured data stores.
|
|
//
|
|
// Once the state is committed, tries cached in stateDB (including account
|
|
// trie, storage tries) will no longer be functional. A new state instance
|
|
// must be created with new root and updated database for accessing post-
|
|
// commit states.
|
|
//
|
|
// The associated block number of the state transition is also provided
|
|
// for more chain context.
|
|
//
|
|
// noStorageWiping is a flag indicating whether storage wiping is permitted.
|
|
// Since self-destruction was deprecated with the Cancun fork and there are
|
|
// no empty accounts left that could be deleted by EIP-158, storage wiping
|
|
// should not occur.
|
|
func (s *StateDB) Commit(block uint64, deleteEmptyObjects bool, noStorageWiping bool) (common.Hash, error) {
|
|
ret, err := s.commitAndFlush(block, deleteEmptyObjects, noStorageWiping)
|
|
if err != nil {
|
|
return common.Hash{}, err
|
|
}
|
|
return ret.root, nil
|
|
}
|
|
|
|
// Prepare handles the preparatory steps for executing a state transition with.
|
|
// This method must be invoked before state transition.
|
|
//
|
|
// Berlin fork:
|
|
// - Add sender to access list (2929)
|
|
// - Add destination to access list (2929)
|
|
// - Add precompiles to access list (2929)
|
|
// - Add the contents of the optional tx access list (2930)
|
|
//
|
|
// Potential EIPs:
|
|
// - Reset access list (Berlin)
|
|
// - Add coinbase to access list (EIP-3651)
|
|
// - Reset transient storage (EIP-1153)
|
|
func (s *StateDB) Prepare(rules params.Rules, sender, coinbase common.Address, dst *common.Address, precompiles []common.Address, list types.AccessList) {
|
|
if rules.IsEIP2929 && rules.IsEIP4762 {
|
|
panic("eip2929 and eip4762 are both activated")
|
|
}
|
|
if rules.IsEIP2929 {
|
|
// Clear out any leftover from previous executions
|
|
al := newAccessList()
|
|
s.accessList = al
|
|
|
|
al.AddAddress(sender)
|
|
if dst != nil {
|
|
al.AddAddress(*dst)
|
|
// If it's a create-tx, the destination will be added inside evm.create
|
|
}
|
|
for _, addr := range precompiles {
|
|
al.AddAddress(addr)
|
|
}
|
|
for _, el := range list {
|
|
al.AddAddress(el.Address)
|
|
for _, key := range el.StorageKeys {
|
|
al.AddSlot(el.Address, key)
|
|
}
|
|
}
|
|
if rules.IsShanghai { // EIP-3651: warm coinbase
|
|
al.AddAddress(coinbase)
|
|
}
|
|
}
|
|
// Reset transient storage at the beginning of transaction execution
|
|
s.transientStorage = newTransientStorage()
|
|
}
|
|
|
|
// AddAddressToAccessList adds the given address to the access list
|
|
func (s *StateDB) AddAddressToAccessList(addr common.Address) {
|
|
if s.accessList.AddAddress(addr) {
|
|
s.journal.accessListAddAccount(addr)
|
|
}
|
|
}
|
|
|
|
// AddSlotToAccessList adds the given (address, slot)-tuple to the access list
|
|
func (s *StateDB) AddSlotToAccessList(addr common.Address, slot common.Hash) {
|
|
addrMod, slotMod := s.accessList.AddSlot(addr, slot)
|
|
if addrMod {
|
|
// In practice, this should not happen, since there is no way to enter the
|
|
// scope of 'address' without having the 'address' become already added
|
|
// to the access list (via call-variant, create, etc).
|
|
// Better safe than sorry, though
|
|
s.journal.accessListAddAccount(addr)
|
|
}
|
|
if slotMod {
|
|
s.journal.accessListAddSlot(addr, slot)
|
|
}
|
|
}
|
|
|
|
// AddressInAccessList returns true if the given address is in the access list.
|
|
func (s *StateDB) AddressInAccessList(addr common.Address) bool {
|
|
return s.accessList.ContainsAddress(addr)
|
|
}
|
|
|
|
// SlotInAccessList returns true if the given (address, slot)-tuple is in the access list.
|
|
func (s *StateDB) SlotInAccessList(addr common.Address, slot common.Hash) (addressPresent bool, slotPresent bool) {
|
|
return s.accessList.Contains(addr, slot)
|
|
}
|
|
|
|
// markDelete is invoked when an account is deleted but the deletion is
|
|
// not yet committed. The pending mutation is cached and will be applied
|
|
// all together
|
|
func (s *StateDB) markDelete(addr common.Address) {
|
|
if _, ok := s.mutations[addr]; !ok {
|
|
s.mutations[addr] = &mutation{}
|
|
}
|
|
s.mutations[addr].applied = false
|
|
s.mutations[addr].typ = deletion
|
|
}
|
|
|
|
func (s *StateDB) markUpdate(addr common.Address) {
|
|
if _, ok := s.mutations[addr]; !ok {
|
|
s.mutations[addr] = &mutation{}
|
|
}
|
|
s.mutations[addr].applied = false
|
|
s.mutations[addr].typ = update
|
|
}
|
|
|
|
// PointCache returns the point cache used by verkle tree.
|
|
func (s *StateDB) PointCache() *utils.PointCache {
|
|
return s.db.PointCache()
|
|
}
|
|
|
|
// Witness retrieves the current state witness being collected.
|
|
func (s *StateDB) Witness() *stateless.Witness {
|
|
return s.witness
|
|
}
|
|
|
|
func (s *StateDB) AccessEvents() *AccessEvents {
|
|
return s.accessEvents
|
|
}
|