mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-01 09:33:46 +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>
1396 lines
63 KiB
Go
1396 lines
63 KiB
Go
// Copyright 2021 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 catalyst implements the temporary eth1/eth2 RPC integration.
|
|
package catalyst
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"math/big"
|
|
"strconv"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/beacon/engine"
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/ethereum/go-ethereum/core"
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
"github.com/ethereum/go-ethereum/core/stateless"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/core/vm"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/eth"
|
|
"github.com/ethereum/go-ethereum/eth/ethconfig"
|
|
"github.com/ethereum/go-ethereum/internal/version"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/miner"
|
|
"github.com/ethereum/go-ethereum/node"
|
|
"github.com/ethereum/go-ethereum/params/forks"
|
|
"github.com/ethereum/go-ethereum/rlp"
|
|
"github.com/ethereum/go-ethereum/rpc"
|
|
)
|
|
|
|
// Register adds the engine API to the full node.
|
|
func Register(stack *node.Node, backend *eth.Ethereum) error {
|
|
log.Warn("Engine API enabled", "protocol", "eth")
|
|
stack.RegisterAPIs([]rpc.API{
|
|
{
|
|
Namespace: "engine",
|
|
Service: NewConsensusAPI(backend),
|
|
Authenticated: true,
|
|
},
|
|
})
|
|
return nil
|
|
}
|
|
|
|
const (
|
|
// invalidBlockHitEviction is the number of times an invalid block can be
|
|
// referenced in forkchoice update or new payload before it is attempted
|
|
// to be reprocessed again.
|
|
invalidBlockHitEviction = 128
|
|
|
|
// invalidTipsetsCap is the max number of recent block hashes tracked that
|
|
// have lead to some bad ancestor block. It's just an OOM protection.
|
|
invalidTipsetsCap = 512
|
|
|
|
// beaconUpdateStartupTimeout is the time to wait for a beacon client to get
|
|
// attached before starting to issue warnings.
|
|
beaconUpdateStartupTimeout = 30 * time.Second
|
|
|
|
// beaconUpdateConsensusTimeout is the max time allowed for a beacon client
|
|
// to send a consensus update before it's considered offline and the user is
|
|
// warned.
|
|
beaconUpdateConsensusTimeout = 2 * time.Minute
|
|
|
|
// beaconUpdateWarnFrequency is the frequency at which to warn the user that
|
|
// the beacon client is offline.
|
|
beaconUpdateWarnFrequency = 5 * time.Minute
|
|
)
|
|
|
|
// All methods provided over the engine endpoint.
|
|
var caps = []string{
|
|
"engine_forkchoiceUpdatedV1",
|
|
"engine_forkchoiceUpdatedV2",
|
|
"engine_forkchoiceUpdatedV3",
|
|
"engine_forkchoiceUpdatedWithWitnessV1",
|
|
"engine_forkchoiceUpdatedWithWitnessV2",
|
|
"engine_forkchoiceUpdatedWithWitnessV3",
|
|
"engine_exchangeTransitionConfigurationV1",
|
|
"engine_getPayloadV1",
|
|
"engine_getPayloadV2",
|
|
"engine_getPayloadV3",
|
|
"engine_getPayloadV4",
|
|
"engine_getBlobsV1",
|
|
"engine_newPayloadV1",
|
|
"engine_newPayloadV2",
|
|
"engine_newPayloadV3",
|
|
"engine_newPayloadV4",
|
|
"engine_newPayloadWithWitnessV1",
|
|
"engine_newPayloadWithWitnessV2",
|
|
"engine_newPayloadWithWitnessV3",
|
|
"engine_newPayloadWithWitnessV4",
|
|
"engine_executeStatelessPayloadV1",
|
|
"engine_executeStatelessPayloadV2",
|
|
"engine_executeStatelessPayloadV3",
|
|
"engine_executeStatelessPayloadV4",
|
|
"engine_getPayloadBodiesByHashV1",
|
|
"engine_getPayloadBodiesByHashV2",
|
|
"engine_getPayloadBodiesByRangeV1",
|
|
"engine_getPayloadBodiesByRangeV2",
|
|
"engine_getClientVersionV1",
|
|
}
|
|
|
|
type ConsensusAPI struct {
|
|
eth *eth.Ethereum
|
|
|
|
remoteBlocks *headerQueue // Cache of remote payloads received
|
|
localBlocks *payloadQueue // Cache of local payloads generated
|
|
|
|
// The forkchoice update and new payload method require us to return the
|
|
// latest valid hash in an invalid chain. To support that return, we need
|
|
// to track historical bad blocks as well as bad tipsets in case a chain
|
|
// is constantly built on it.
|
|
//
|
|
// There are a few important caveats in this mechanism:
|
|
// - The bad block tracking is ephemeral, in-memory only. We must never
|
|
// persist any bad block information to disk as a bug in Geth could end
|
|
// up blocking a valid chain, even if a later Geth update would accept
|
|
// it.
|
|
// - Bad blocks will get forgotten after a certain threshold of import
|
|
// attempts and will be retried. The rationale is that if the network
|
|
// really-really-really tries to feed us a block, we should give it a
|
|
// new chance, perhaps us being racey instead of the block being legit
|
|
// bad (this happened in Geth at a point with import vs. pending race).
|
|
// - Tracking all the blocks built on top of the bad one could be a bit
|
|
// problematic, so we will only track the head chain segment of a bad
|
|
// chain to allow discarding progressing bad chains and side chains,
|
|
// without tracking too much bad data.
|
|
invalidBlocksHits map[common.Hash]int // Ephemeral cache to track invalid blocks and their hit count
|
|
invalidTipsets map[common.Hash]*types.Header // Ephemeral cache to track invalid tipsets and their bad ancestor
|
|
invalidLock sync.Mutex // Protects the invalid maps from concurrent access
|
|
|
|
// Geth can appear to be stuck or do strange things if the beacon client is
|
|
// offline or is sending us strange data. Stash some update stats away so
|
|
// that we can warn the user and not have them open issues on our tracker.
|
|
lastTransitionUpdate time.Time
|
|
lastTransitionLock sync.Mutex
|
|
lastForkchoiceUpdate time.Time
|
|
lastForkchoiceLock sync.Mutex
|
|
lastNewPayloadUpdate time.Time
|
|
lastNewPayloadLock sync.Mutex
|
|
|
|
forkchoiceLock sync.Mutex // Lock for the forkChoiceUpdated method
|
|
newPayloadLock sync.Mutex // Lock for the NewPayload method
|
|
}
|
|
|
|
// NewConsensusAPI creates a new consensus api for the given backend.
|
|
// The underlying blockchain needs to have a valid terminal total difficulty set.
|
|
func NewConsensusAPI(eth *eth.Ethereum) *ConsensusAPI {
|
|
api := newConsensusAPIWithoutHeartbeat(eth)
|
|
go api.heartbeat()
|
|
return api
|
|
}
|
|
|
|
// newConsensusAPIWithoutHeartbeat creates a new consensus api for the SimulatedBeacon Node.
|
|
func newConsensusAPIWithoutHeartbeat(eth *eth.Ethereum) *ConsensusAPI {
|
|
if eth.BlockChain().Config().TerminalTotalDifficulty == nil {
|
|
log.Warn("Engine API started but chain not configured for merge yet")
|
|
}
|
|
api := &ConsensusAPI{
|
|
eth: eth,
|
|
remoteBlocks: newHeaderQueue(),
|
|
localBlocks: newPayloadQueue(),
|
|
invalidBlocksHits: make(map[common.Hash]int),
|
|
invalidTipsets: make(map[common.Hash]*types.Header),
|
|
}
|
|
eth.Downloader().SetBadBlockCallback(api.setInvalidAncestor)
|
|
return api
|
|
}
|
|
|
|
// ForkchoiceUpdatedV1 has several responsibilities:
|
|
//
|
|
// We try to set our blockchain to the headBlock.
|
|
//
|
|
// If the method is called with an empty head block: we return success, which can be used
|
|
// to check if the engine API is enabled.
|
|
//
|
|
// If the total difficulty was not reached: we return INVALID.
|
|
//
|
|
// If the finalizedBlockHash is set: we check if we have the finalizedBlockHash in our db,
|
|
// if not we start a sync.
|
|
//
|
|
// If there are payloadAttributes: we try to assemble a block with the payloadAttributes
|
|
// and return its payloadID.
|
|
func (api *ConsensusAPI) ForkchoiceUpdatedV1(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
|
|
if payloadAttributes != nil {
|
|
if payloadAttributes.Withdrawals != nil || payloadAttributes.BeaconRoot != nil {
|
|
return engine.STATUS_INVALID, engine.InvalidParams.With(errors.New("withdrawals and beacon root not supported in V1"))
|
|
}
|
|
if api.eth.BlockChain().Config().IsShanghai(api.eth.BlockChain().Config().LondonBlock, payloadAttributes.Timestamp) {
|
|
return engine.STATUS_INVALID, engine.InvalidParams.With(errors.New("forkChoiceUpdateV1 called post-shanghai"))
|
|
}
|
|
}
|
|
return api.forkchoiceUpdated(update, payloadAttributes, engine.PayloadV1, false)
|
|
}
|
|
|
|
// ForkchoiceUpdatedV2 is equivalent to V1 with the addition of withdrawals in the payload
|
|
// attributes. It supports both PayloadAttributesV1 and PayloadAttributesV2.
|
|
func (api *ConsensusAPI) ForkchoiceUpdatedV2(update engine.ForkchoiceStateV1, params *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
|
|
if params != nil {
|
|
if params.BeaconRoot != nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("unexpected beacon root"))
|
|
}
|
|
switch api.eth.BlockChain().Config().LatestFork(params.Timestamp) {
|
|
case forks.Paris:
|
|
if params.Withdrawals != nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("withdrawals before shanghai"))
|
|
}
|
|
case forks.Shanghai:
|
|
if params.Withdrawals == nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing withdrawals"))
|
|
}
|
|
default:
|
|
return engine.STATUS_INVALID, engine.UnsupportedFork.With(errors.New("forkchoiceUpdatedV2 must only be called with paris and shanghai payloads"))
|
|
}
|
|
}
|
|
return api.forkchoiceUpdated(update, params, engine.PayloadV2, false)
|
|
}
|
|
|
|
// ForkchoiceUpdatedV3 is equivalent to V2 with the addition of parent beacon block root
|
|
// in the payload attributes. It supports only PayloadAttributesV3.
|
|
func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, params *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
|
|
if params != nil {
|
|
if params.Withdrawals == nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing withdrawals"))
|
|
}
|
|
if params.BeaconRoot == nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing beacon root"))
|
|
}
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun && api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
|
|
return engine.STATUS_INVALID, engine.UnsupportedFork.With(errors.New("forkchoiceUpdatedV3 must only be called for cancun payloads"))
|
|
}
|
|
}
|
|
// TODO(matt): the spec requires that fcu is applied when called on a valid
|
|
// hash, even if params are wrong. To do this we need to split up
|
|
// forkchoiceUpdate into a function that only updates the head and then a
|
|
// function that kicks off block construction.
|
|
return api.forkchoiceUpdated(update, params, engine.PayloadV3, false)
|
|
}
|
|
|
|
// ForkchoiceUpdatedWithWitnessV1 is analogous to ForkchoiceUpdatedV1, only it
|
|
// generates an execution witness too if block building was requested.
|
|
func (api *ConsensusAPI) ForkchoiceUpdatedWithWitnessV1(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
|
|
if payloadAttributes != nil {
|
|
if payloadAttributes.Withdrawals != nil || payloadAttributes.BeaconRoot != nil {
|
|
return engine.STATUS_INVALID, engine.InvalidParams.With(errors.New("withdrawals and beacon root not supported in V1"))
|
|
}
|
|
if api.eth.BlockChain().Config().IsShanghai(api.eth.BlockChain().Config().LondonBlock, payloadAttributes.Timestamp) {
|
|
return engine.STATUS_INVALID, engine.InvalidParams.With(errors.New("forkChoiceUpdateV1 called post-shanghai"))
|
|
}
|
|
}
|
|
return api.forkchoiceUpdated(update, payloadAttributes, engine.PayloadV1, true)
|
|
}
|
|
|
|
// ForkchoiceUpdatedWithWitnessV2 is analogous to ForkchoiceUpdatedV2, only it
|
|
// generates an execution witness too if block building was requested.
|
|
func (api *ConsensusAPI) ForkchoiceUpdatedWithWitnessV2(update engine.ForkchoiceStateV1, params *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
|
|
if params != nil {
|
|
if params.BeaconRoot != nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("unexpected beacon root"))
|
|
}
|
|
switch api.eth.BlockChain().Config().LatestFork(params.Timestamp) {
|
|
case forks.Paris:
|
|
if params.Withdrawals != nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("withdrawals before shanghai"))
|
|
}
|
|
case forks.Shanghai:
|
|
if params.Withdrawals == nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing withdrawals"))
|
|
}
|
|
default:
|
|
return engine.STATUS_INVALID, engine.UnsupportedFork.With(errors.New("forkchoiceUpdatedV2 must only be called with paris and shanghai payloads"))
|
|
}
|
|
}
|
|
return api.forkchoiceUpdated(update, params, engine.PayloadV2, true)
|
|
}
|
|
|
|
// ForkchoiceUpdatedWithWitnessV3 is analogous to ForkchoiceUpdatedV3, only it
|
|
// generates an execution witness too if block building was requested.
|
|
func (api *ConsensusAPI) ForkchoiceUpdatedWithWitnessV3(update engine.ForkchoiceStateV1, params *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
|
|
if params != nil {
|
|
if params.Withdrawals == nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing withdrawals"))
|
|
}
|
|
if params.BeaconRoot == nil {
|
|
return engine.STATUS_INVALID, engine.InvalidPayloadAttributes.With(errors.New("missing beacon root"))
|
|
}
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun && api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
|
|
return engine.STATUS_INVALID, engine.UnsupportedFork.With(errors.New("forkchoiceUpdatedV3 must only be called for cancun payloads"))
|
|
}
|
|
}
|
|
// TODO(matt): the spec requires that fcu is applied when called on a valid
|
|
// hash, even if params are wrong. To do this we need to split up
|
|
// forkchoiceUpdate into a function that only updates the head and then a
|
|
// function that kicks off block construction.
|
|
return api.forkchoiceUpdated(update, params, engine.PayloadV3, true)
|
|
}
|
|
|
|
func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes, payloadVersion engine.PayloadVersion, payloadWitness bool) (engine.ForkChoiceResponse, error) {
|
|
api.forkchoiceLock.Lock()
|
|
defer api.forkchoiceLock.Unlock()
|
|
|
|
log.Trace("Engine API request received", "method", "ForkchoiceUpdated", "head", update.HeadBlockHash, "finalized", update.FinalizedBlockHash, "safe", update.SafeBlockHash)
|
|
if update.HeadBlockHash == (common.Hash{}) {
|
|
log.Warn("Forkchoice requested update to zero hash")
|
|
return engine.STATUS_INVALID, nil // TODO(karalabe): Why does someone send us this?
|
|
}
|
|
// Stash away the last update to warn the user if the beacon client goes offline
|
|
api.lastForkchoiceLock.Lock()
|
|
api.lastForkchoiceUpdate = time.Now()
|
|
api.lastForkchoiceLock.Unlock()
|
|
|
|
// Check whether we have the block yet in our database or not. If not, we'll
|
|
// need to either trigger a sync, or to reject this forkchoice update for a
|
|
// reason.
|
|
block := api.eth.BlockChain().GetBlockByHash(update.HeadBlockHash)
|
|
if block == nil {
|
|
// If this block was previously invalidated, keep rejecting it here too
|
|
if res := api.checkInvalidAncestor(update.HeadBlockHash, update.HeadBlockHash); res != nil {
|
|
return engine.ForkChoiceResponse{PayloadStatus: *res, PayloadID: nil}, nil
|
|
}
|
|
// If the head hash is unknown (was not given to us in a newPayload request),
|
|
// we cannot resolve the header, so not much to do. This could be extended in
|
|
// the future to resolve from the `eth` network, but it's an unexpected case
|
|
// that should be fixed, not papered over.
|
|
header := api.remoteBlocks.get(update.HeadBlockHash)
|
|
if header == nil {
|
|
log.Warn("Forkchoice requested unknown head", "hash", update.HeadBlockHash)
|
|
return engine.STATUS_SYNCING, nil
|
|
}
|
|
// If the finalized hash is known, we can direct the downloader to move
|
|
// potentially more data to the freezer from the get go.
|
|
finalized := api.remoteBlocks.get(update.FinalizedBlockHash)
|
|
|
|
// Header advertised via a past newPayload request. Start syncing to it.
|
|
context := []interface{}{"number", header.Number, "hash", header.Hash()}
|
|
if update.FinalizedBlockHash != (common.Hash{}) {
|
|
if finalized == nil {
|
|
context = append(context, []interface{}{"finalized", "unknown"}...)
|
|
} else {
|
|
context = append(context, []interface{}{"finalized", finalized.Number}...)
|
|
}
|
|
}
|
|
log.Info("Forkchoice requested sync to new head", context...)
|
|
if err := api.eth.Downloader().BeaconSync(api.eth.SyncMode(), header, finalized); err != nil {
|
|
return engine.STATUS_SYNCING, err
|
|
}
|
|
return engine.STATUS_SYNCING, nil
|
|
}
|
|
// Block is known locally, just sanity check that the beacon client does not
|
|
// attempt to push us back to before the merge.
|
|
if block.Difficulty().BitLen() > 0 && block.NumberU64() > 0 {
|
|
ph := api.eth.BlockChain().GetHeader(block.ParentHash(), block.NumberU64()-1)
|
|
if ph == nil {
|
|
return engine.STATUS_INVALID, errors.New("parent unavailable for difficulty check")
|
|
}
|
|
if ph.Difficulty.Sign() == 0 && block.Difficulty().Sign() > 0 {
|
|
log.Error("Parent block is already post-ttd", "number", block.NumberU64(), "hash", update.HeadBlockHash, "diff", block.Difficulty(), "age", common.PrettyAge(time.Unix(int64(block.Time()), 0)))
|
|
return engine.ForkChoiceResponse{PayloadStatus: engine.INVALID_TERMINAL_BLOCK, PayloadID: nil}, nil
|
|
}
|
|
}
|
|
valid := func(id *engine.PayloadID) engine.ForkChoiceResponse {
|
|
return engine.ForkChoiceResponse{
|
|
PayloadStatus: engine.PayloadStatusV1{Status: engine.VALID, LatestValidHash: &update.HeadBlockHash},
|
|
PayloadID: id,
|
|
}
|
|
}
|
|
|
|
// CHANGE(taiko): check whether `--taiko` flag is set.
|
|
isTaiko := api.eth.BlockChain().Config().Taiko
|
|
|
|
if rawdb.ReadCanonicalHash(api.eth.ChainDb(), block.NumberU64()) != update.HeadBlockHash {
|
|
// Block is not canonical, set head.
|
|
if latestValid, err := api.eth.BlockChain().SetCanonical(block); err != nil {
|
|
return engine.ForkChoiceResponse{PayloadStatus: engine.PayloadStatusV1{Status: engine.INVALID, LatestValidHash: &latestValid}}, err
|
|
}
|
|
} else if api.eth.BlockChain().CurrentBlock().Hash() == update.HeadBlockHash {
|
|
// If the specified head matches with our local head, do nothing and keep
|
|
// generating the payload. It's a special corner case that a few slots are
|
|
// missing and we are requested to generate the payload in slot.
|
|
} else if isTaiko { // CHANGE(taiko): reorg is allowed in L2.
|
|
if latestValid, err := api.eth.BlockChain().SetCanonical(block); err != nil {
|
|
return engine.ForkChoiceResponse{PayloadStatus: engine.PayloadStatusV1{Status: engine.INVALID, LatestValidHash: &latestValid}}, err
|
|
}
|
|
} else {
|
|
// If the head block is already in our canonical chain, the beacon client is
|
|
// probably resyncing. Ignore the update.
|
|
log.Info("Ignoring beacon update to old head", "number", block.NumberU64(), "hash", update.HeadBlockHash, "age", common.PrettyAge(time.Unix(int64(block.Time()), 0)), "have", api.eth.BlockChain().CurrentBlock().Number)
|
|
return valid(nil), nil
|
|
}
|
|
api.eth.SetSynced()
|
|
|
|
// If the beacon client also advertised a finalized block, mark the local
|
|
// chain final and completely in PoS mode.
|
|
if update.FinalizedBlockHash != (common.Hash{}) {
|
|
// If the finalized block is not in our canonical tree, something is wrong
|
|
finalBlock := api.eth.BlockChain().GetBlockByHash(update.FinalizedBlockHash)
|
|
if finalBlock == nil {
|
|
log.Warn("Final block not available in database", "hash", update.FinalizedBlockHash)
|
|
return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("final block not available in database"))
|
|
} else if rawdb.ReadCanonicalHash(api.eth.ChainDb(), finalBlock.NumberU64()) != update.FinalizedBlockHash {
|
|
log.Warn("Final block not in canonical chain", "number", finalBlock.NumberU64(), "hash", update.FinalizedBlockHash)
|
|
return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("final block not in canonical chain"))
|
|
}
|
|
// Set the finalized block
|
|
api.eth.BlockChain().SetFinalized(finalBlock.Header())
|
|
}
|
|
// Check if the safe block hash is in our canonical tree, if not something is wrong
|
|
if update.SafeBlockHash != (common.Hash{}) {
|
|
safeBlock := api.eth.BlockChain().GetBlockByHash(update.SafeBlockHash)
|
|
if safeBlock == nil {
|
|
log.Warn("Safe block not available in database")
|
|
return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("safe block not available in database"))
|
|
}
|
|
if rawdb.ReadCanonicalHash(api.eth.ChainDb(), safeBlock.NumberU64()) != update.SafeBlockHash {
|
|
log.Warn("Safe block not in canonical chain")
|
|
return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("safe block not in canonical chain"))
|
|
}
|
|
// Set the safe block
|
|
api.eth.BlockChain().SetSafe(safeBlock.Header())
|
|
}
|
|
// If payload generation was requested, create a new block to be potentially
|
|
// sealed by the beacon client. The payload will be requested later, and we
|
|
// will replace it arbitrarily many times in between.
|
|
if payloadAttributes != nil {
|
|
// CHANGE(taiko): create a L2 block by Taiko protocol.
|
|
if isTaiko {
|
|
// No need to check payloadAttribute here, because all its fields are
|
|
// marked as required.
|
|
block, err := api.eth.Miner().SealBlockWith(
|
|
update.HeadBlockHash,
|
|
payloadAttributes.Timestamp,
|
|
payloadAttributes.BlockMetadata,
|
|
payloadAttributes.BaseFeePerGas,
|
|
payloadAttributes.Withdrawals,
|
|
)
|
|
if err != nil {
|
|
log.Error("Failed to create sealing block", "err", err)
|
|
return valid(nil), engine.InvalidPayloadAttributes.With(err)
|
|
}
|
|
|
|
// Use the tx list hash as the beacon root.
|
|
txListHash := crypto.Keccak256Hash(payloadAttributes.BlockMetadata.TxList[:])
|
|
// Cache the mined block for later use.
|
|
args := &miner.BuildPayloadArgs{
|
|
Parent: block.ParentHash(),
|
|
Timestamp: block.Time(),
|
|
FeeRecipient: block.Coinbase(),
|
|
Random: block.MixDigest(),
|
|
Withdrawals: block.Withdrawals(),
|
|
Version: payloadVersion,
|
|
TxListHash: &txListHash,
|
|
}
|
|
id := args.Id()
|
|
// If we already are busy generating this work, then we do not need
|
|
// to start a second process.
|
|
if api.localBlocks.has(id) {
|
|
return valid(&id), nil
|
|
}
|
|
payload, err := api.eth.Miner().BuildPayload(args, false)
|
|
if err != nil {
|
|
log.Error("Failed to build payload", "err", err)
|
|
return valid(nil), engine.InvalidPayloadAttributes.With(err)
|
|
}
|
|
|
|
payload.SetFullBlock(block, common.Big0)
|
|
|
|
api.localBlocks.put(id, payload)
|
|
|
|
// L1Origin **MUST NOT** be nil, it's a required field in PayloadAttributesV1.
|
|
l1Origin := payloadAttributes.L1Origin
|
|
|
|
// Set the block hash before inserting the L1Origin into database.
|
|
l1Origin.L2BlockHash = block.Hash()
|
|
|
|
// Write L1Origin.
|
|
rawdb.WriteL1Origin(api.eth.ChainDb(), l1Origin.BlockID, l1Origin)
|
|
|
|
// Write the head L1Origin, only when it's not a preconfirmation block.
|
|
if !l1Origin.IsPreconfBlock() {
|
|
rawdb.WriteHeadL1Origin(api.eth.ChainDb(), l1Origin.BlockID)
|
|
}
|
|
|
|
return valid(&id), nil
|
|
}
|
|
|
|
args := &miner.BuildPayloadArgs{
|
|
Parent: update.HeadBlockHash,
|
|
Timestamp: payloadAttributes.Timestamp,
|
|
FeeRecipient: payloadAttributes.SuggestedFeeRecipient,
|
|
Random: payloadAttributes.Random,
|
|
Withdrawals: payloadAttributes.Withdrawals,
|
|
BeaconRoot: payloadAttributes.BeaconRoot,
|
|
Version: payloadVersion,
|
|
}
|
|
id := args.Id()
|
|
// If we already are busy generating this work, then we do not need
|
|
// to start a second process.
|
|
if api.localBlocks.has(id) {
|
|
return valid(&id), nil
|
|
}
|
|
payload, err := api.eth.Miner().BuildPayload(args, payloadWitness)
|
|
if err != nil {
|
|
log.Error("Failed to build payload", "err", err)
|
|
return valid(nil), engine.InvalidPayloadAttributes.With(err)
|
|
}
|
|
api.localBlocks.put(id, payload)
|
|
return valid(&id), nil
|
|
}
|
|
return valid(nil), nil
|
|
}
|
|
|
|
// ExchangeTransitionConfigurationV1 checks the given configuration against
|
|
// the configuration of the node.
|
|
func (api *ConsensusAPI) ExchangeTransitionConfigurationV1(config engine.TransitionConfigurationV1) (*engine.TransitionConfigurationV1, error) {
|
|
log.Trace("Engine API request received", "method", "ExchangeTransitionConfiguration", "ttd", config.TerminalTotalDifficulty)
|
|
if config.TerminalTotalDifficulty == nil {
|
|
return nil, errors.New("invalid terminal total difficulty")
|
|
}
|
|
// Stash away the last update to warn the user if the beacon client goes offline
|
|
api.lastTransitionLock.Lock()
|
|
api.lastTransitionUpdate = time.Now()
|
|
api.lastTransitionLock.Unlock()
|
|
|
|
ttd := api.eth.BlockChain().Config().TerminalTotalDifficulty
|
|
if ttd == nil || ttd.Cmp(config.TerminalTotalDifficulty.ToInt()) != 0 {
|
|
log.Warn("Invalid TTD configured", "geth", ttd, "beacon", config.TerminalTotalDifficulty)
|
|
return nil, fmt.Errorf("invalid ttd: execution %v consensus %v", ttd, config.TerminalTotalDifficulty)
|
|
}
|
|
if config.TerminalBlockHash != (common.Hash{}) {
|
|
if hash := api.eth.BlockChain().GetCanonicalHash(uint64(config.TerminalBlockNumber)); hash == config.TerminalBlockHash {
|
|
return &engine.TransitionConfigurationV1{
|
|
TerminalTotalDifficulty: (*hexutil.Big)(ttd),
|
|
TerminalBlockHash: config.TerminalBlockHash,
|
|
TerminalBlockNumber: config.TerminalBlockNumber,
|
|
}, nil
|
|
}
|
|
return nil, errors.New("invalid terminal block hash")
|
|
}
|
|
return &engine.TransitionConfigurationV1{TerminalTotalDifficulty: (*hexutil.Big)(ttd)}, nil
|
|
}
|
|
|
|
// GetPayloadV1 returns a cached payload by id.
|
|
func (api *ConsensusAPI) GetPayloadV1(payloadID engine.PayloadID) (*engine.ExecutableData, error) {
|
|
if !payloadID.Is(engine.PayloadV1) {
|
|
return nil, engine.UnsupportedFork
|
|
}
|
|
data, err := api.getPayload(payloadID, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return data.ExecutionPayload, nil
|
|
}
|
|
|
|
// GetPayloadV2 returns a cached payload by id.
|
|
func (api *ConsensusAPI) GetPayloadV2(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
|
|
if !payloadID.Is(engine.PayloadV1, engine.PayloadV2) {
|
|
return nil, engine.UnsupportedFork
|
|
}
|
|
return api.getPayload(payloadID, false)
|
|
}
|
|
|
|
// GetPayloadV3 returns a cached payload by id.
|
|
func (api *ConsensusAPI) GetPayloadV3(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
|
|
if !payloadID.Is(engine.PayloadV3) {
|
|
return nil, engine.UnsupportedFork
|
|
}
|
|
return api.getPayload(payloadID, false)
|
|
}
|
|
|
|
// GetPayloadV4 returns a cached payload by id.
|
|
func (api *ConsensusAPI) GetPayloadV4(payloadID engine.PayloadID) (*engine.ExecutionPayloadEnvelope, error) {
|
|
if !payloadID.Is(engine.PayloadV3) {
|
|
return nil, engine.UnsupportedFork
|
|
}
|
|
return api.getPayload(payloadID, false)
|
|
}
|
|
|
|
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool) (*engine.ExecutionPayloadEnvelope, error) {
|
|
log.Trace("Engine API request received", "method", "GetPayload", "id", payloadID)
|
|
data := api.localBlocks.get(payloadID, full)
|
|
if data == nil {
|
|
return nil, engine.UnknownPayload
|
|
}
|
|
return data, nil
|
|
}
|
|
|
|
// GetBlobsV1 returns a blob from the transaction pool.
|
|
func (api *ConsensusAPI) GetBlobsV1(hashes []common.Hash) ([]*engine.BlobAndProofV1, error) {
|
|
if len(hashes) > 128 {
|
|
return nil, engine.TooLargeRequest.With(fmt.Errorf("requested blob count too large: %v", len(hashes)))
|
|
}
|
|
res := make([]*engine.BlobAndProofV1, len(hashes))
|
|
|
|
blobs, proofs := api.eth.TxPool().GetBlobs(hashes)
|
|
for i := 0; i < len(blobs); i++ {
|
|
if blobs[i] != nil {
|
|
res[i] = &engine.BlobAndProofV1{
|
|
Blob: (*blobs[i])[:],
|
|
Proof: (*proofs[i])[:],
|
|
}
|
|
}
|
|
}
|
|
return res, nil
|
|
}
|
|
|
|
// NewPayloadV1 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
|
|
func (api *ConsensusAPI) NewPayloadV1(params engine.ExecutableData) (engine.PayloadStatusV1, error) {
|
|
if params.Withdrawals != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("withdrawals not supported in V1"))
|
|
}
|
|
return api.newPayload(params, nil, nil, nil, false)
|
|
}
|
|
|
|
// NewPayloadV2 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
|
|
func (api *ConsensusAPI) NewPayloadV2(params engine.ExecutableData) (engine.PayloadStatusV1, error) {
|
|
if api.eth.BlockChain().Config().IsCancun(api.eth.BlockChain().Config().LondonBlock, params.Timestamp) {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("can't use newPayloadV2 post-cancun"))
|
|
}
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Shanghai {
|
|
if params.Withdrawals == nil &&
|
|
(api.eth.BlockChain().Config().Taiko && params.WithdrawalsHash == (common.Hash{})) {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
} else {
|
|
if params.Withdrawals != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil withdrawals pre-shanghai"))
|
|
}
|
|
}
|
|
if params.ExcessBlobGas != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil excessBlobGas pre-cancun"))
|
|
}
|
|
if params.BlobGasUsed != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil blobGasUsed pre-cancun"))
|
|
}
|
|
return api.newPayload(params, nil, nil, nil, false)
|
|
}
|
|
|
|
// NewPayloadV3 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
|
|
func (api *ConsensusAPI) NewPayloadV3(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (engine.PayloadStatusV1, error) {
|
|
if params.Withdrawals == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
if params.ExcessBlobGas == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
|
|
}
|
|
if params.BlobGasUsed == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
|
|
}
|
|
|
|
if versionedHashes == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
|
|
}
|
|
if beaconRoot == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
|
|
}
|
|
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadV3 must only be called for cancun payloads"))
|
|
}
|
|
return api.newPayload(params, versionedHashes, beaconRoot, nil, false)
|
|
}
|
|
|
|
// NewPayloadV4 creates an Eth1 block, inserts it in the chain, and returns the status of the chain.
|
|
func (api *ConsensusAPI) NewPayloadV4(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, executionRequests []hexutil.Bytes) (engine.PayloadStatusV1, error) {
|
|
if params.Withdrawals == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
if params.ExcessBlobGas == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
|
|
}
|
|
if params.BlobGasUsed == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
|
|
}
|
|
|
|
if versionedHashes == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
|
|
}
|
|
if beaconRoot == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
|
|
}
|
|
if executionRequests == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil executionRequests post-prague"))
|
|
}
|
|
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadV4 must only be called for prague payloads"))
|
|
}
|
|
requests := convertRequests(executionRequests)
|
|
if err := validateRequests(requests); err != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(err)
|
|
}
|
|
return api.newPayload(params, versionedHashes, beaconRoot, requests, false)
|
|
}
|
|
|
|
// NewPayloadWithWitnessV1 is analogous to NewPayloadV1, only it also generates
|
|
// and returns a stateless witness after running the payload.
|
|
func (api *ConsensusAPI) NewPayloadWithWitnessV1(params engine.ExecutableData) (engine.PayloadStatusV1, error) {
|
|
if params.Withdrawals != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("withdrawals not supported in V1"))
|
|
}
|
|
return api.newPayload(params, nil, nil, nil, true)
|
|
}
|
|
|
|
// NewPayloadWithWitnessV2 is analogous to NewPayloadV2, only it also generates
|
|
// and returns a stateless witness after running the payload.
|
|
func (api *ConsensusAPI) NewPayloadWithWitnessV2(params engine.ExecutableData) (engine.PayloadStatusV1, error) {
|
|
if api.eth.BlockChain().Config().IsCancun(api.eth.BlockChain().Config().LondonBlock, params.Timestamp) {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("can't use newPayloadV2 post-cancun"))
|
|
}
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Shanghai {
|
|
if params.Withdrawals == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
} else {
|
|
if params.Withdrawals != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil withdrawals pre-shanghai"))
|
|
}
|
|
}
|
|
if params.ExcessBlobGas != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil excessBlobGas pre-cancun"))
|
|
}
|
|
if params.BlobGasUsed != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil blobGasUsed pre-cancun"))
|
|
}
|
|
return api.newPayload(params, nil, nil, nil, true)
|
|
}
|
|
|
|
// NewPayloadWithWitnessV3 is analogous to NewPayloadV3, only it also generates
|
|
// and returns a stateless witness after running the payload.
|
|
func (api *ConsensusAPI) NewPayloadWithWitnessV3(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (engine.PayloadStatusV1, error) {
|
|
if params.Withdrawals == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
if params.ExcessBlobGas == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
|
|
}
|
|
if params.BlobGasUsed == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
|
|
}
|
|
|
|
if versionedHashes == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
|
|
}
|
|
if beaconRoot == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
|
|
}
|
|
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadWithWitnessV3 must only be called for cancun payloads"))
|
|
}
|
|
return api.newPayload(params, versionedHashes, beaconRoot, nil, true)
|
|
}
|
|
|
|
// NewPayloadWithWitnessV4 is analogous to NewPayloadV4, only it also generates
|
|
// and returns a stateless witness after running the payload.
|
|
func (api *ConsensusAPI) NewPayloadWithWitnessV4(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, executionRequests []hexutil.Bytes) (engine.PayloadStatusV1, error) {
|
|
if params.Withdrawals == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
if params.ExcessBlobGas == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
|
|
}
|
|
if params.BlobGasUsed == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
|
|
}
|
|
|
|
if versionedHashes == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
|
|
}
|
|
if beaconRoot == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
|
|
}
|
|
if executionRequests == nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil executionRequests post-prague"))
|
|
}
|
|
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("newPayloadWithWitnessV4 must only be called for prague payloads"))
|
|
}
|
|
requests := convertRequests(executionRequests)
|
|
if err := validateRequests(requests); err != nil {
|
|
return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(err)
|
|
}
|
|
return api.newPayload(params, versionedHashes, beaconRoot, requests, true)
|
|
}
|
|
|
|
// ExecuteStatelessPayloadV1 is analogous to NewPayloadV1, only it operates in
|
|
// a stateless mode on top of a provided witness instead of the local database.
|
|
func (api *ConsensusAPI) ExecuteStatelessPayloadV1(params engine.ExecutableData, opaqueWitness hexutil.Bytes) (engine.StatelessPayloadStatusV1, error) {
|
|
if params.Withdrawals != nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("withdrawals not supported in V1"))
|
|
}
|
|
return api.executeStatelessPayload(params, nil, nil, nil, opaqueWitness)
|
|
}
|
|
|
|
// ExecuteStatelessPayloadV2 is analogous to NewPayloadV2, only it operates in
|
|
// a stateless mode on top of a provided witness instead of the local database.
|
|
func (api *ConsensusAPI) ExecuteStatelessPayloadV2(params engine.ExecutableData, opaqueWitness hexutil.Bytes) (engine.StatelessPayloadStatusV1, error) {
|
|
if api.eth.BlockChain().Config().IsCancun(api.eth.BlockChain().Config().LondonBlock, params.Timestamp) {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("can't use newPayloadV2 post-cancun"))
|
|
}
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Shanghai {
|
|
if params.Withdrawals == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
} else {
|
|
if params.Withdrawals != nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil withdrawals pre-shanghai"))
|
|
}
|
|
}
|
|
if params.ExcessBlobGas != nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil excessBlobGas pre-cancun"))
|
|
}
|
|
if params.BlobGasUsed != nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("non-nil blobGasUsed pre-cancun"))
|
|
}
|
|
return api.executeStatelessPayload(params, nil, nil, nil, opaqueWitness)
|
|
}
|
|
|
|
// ExecuteStatelessPayloadV3 is analogous to NewPayloadV3, only it operates in
|
|
// a stateless mode on top of a provided witness instead of the local database.
|
|
func (api *ConsensusAPI) ExecuteStatelessPayloadV3(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, opaqueWitness hexutil.Bytes) (engine.StatelessPayloadStatusV1, error) {
|
|
if params.Withdrawals == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
if params.ExcessBlobGas == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
|
|
}
|
|
if params.BlobGasUsed == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
|
|
}
|
|
|
|
if versionedHashes == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
|
|
}
|
|
if beaconRoot == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
|
|
}
|
|
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Cancun {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("executeStatelessPayloadV3 must only be called for cancun payloads"))
|
|
}
|
|
return api.executeStatelessPayload(params, versionedHashes, beaconRoot, nil, opaqueWitness)
|
|
}
|
|
|
|
// ExecuteStatelessPayloadV4 is analogous to NewPayloadV4, only it operates in
|
|
// a stateless mode on top of a provided witness instead of the local database.
|
|
func (api *ConsensusAPI) ExecuteStatelessPayloadV4(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, executionRequests []hexutil.Bytes, opaqueWitness hexutil.Bytes) (engine.StatelessPayloadStatusV1, error) {
|
|
if params.Withdrawals == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil withdrawals post-shanghai"))
|
|
}
|
|
if params.ExcessBlobGas == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil excessBlobGas post-cancun"))
|
|
}
|
|
if params.BlobGasUsed == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil blobGasUsed post-cancun"))
|
|
}
|
|
|
|
if versionedHashes == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil versionedHashes post-cancun"))
|
|
}
|
|
if beaconRoot == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil beaconRoot post-cancun"))
|
|
}
|
|
if executionRequests == nil {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(errors.New("nil executionRequests post-prague"))
|
|
}
|
|
|
|
if api.eth.BlockChain().Config().LatestFork(params.Timestamp) != forks.Prague {
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID}, engine.UnsupportedFork.With(errors.New("executeStatelessPayloadV4 must only be called for prague payloads"))
|
|
}
|
|
requests := convertRequests(executionRequests)
|
|
return api.executeStatelessPayload(params, versionedHashes, beaconRoot, requests, opaqueWitness)
|
|
}
|
|
|
|
func (api *ConsensusAPI) newPayload(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, requests [][]byte, witness bool) (engine.PayloadStatusV1, error) {
|
|
// The locking here is, strictly, not required. Without these locks, this can happen:
|
|
//
|
|
// 1. NewPayload( execdata-N ) is invoked from the CL. It goes all the way down to
|
|
// api.eth.BlockChain().InsertBlockWithoutSetHead, where it is blocked on
|
|
// e.g database compaction.
|
|
// 2. The call times out on the CL layer, which issues another NewPayload (execdata-N) call.
|
|
// Similarly, this also get stuck on the same place. Importantly, since the
|
|
// first call has not gone through, the early checks for "do we already have this block"
|
|
// will all return false.
|
|
// 3. When the db compaction ends, then N calls inserting the same payload are processed
|
|
// sequentially.
|
|
// Hence, we use a lock here, to be sure that the previous call has finished before we
|
|
// check whether we already have the block locally.
|
|
api.newPayloadLock.Lock()
|
|
defer api.newPayloadLock.Unlock()
|
|
|
|
log.Trace("Engine API request received", "method", "NewPayload", "number", params.Number, "hash", params.BlockHash)
|
|
// CHANGE(taiko): allow passing the executable data with txHash instead of all transactions.
|
|
var (
|
|
block *types.Block
|
|
err error
|
|
)
|
|
params.TaikoBlock = api.eth.BlockChain().Config().Taiko
|
|
if api.eth.BlockChain().Config().Taiko && params.Transactions == nil && params.Withdrawals == nil {
|
|
block = types.NewBlockWithHeader(&types.Header{
|
|
ParentHash: params.ParentHash,
|
|
UncleHash: types.EmptyUncleHash,
|
|
Coinbase: params.FeeRecipient,
|
|
Root: params.StateRoot,
|
|
TxHash: params.TxHash,
|
|
ReceiptHash: params.ReceiptsRoot,
|
|
Bloom: types.BytesToBloom(params.LogsBloom),
|
|
Difficulty: common.Big0,
|
|
Number: new(big.Int).SetUint64(params.Number),
|
|
GasLimit: params.GasLimit,
|
|
GasUsed: params.GasUsed,
|
|
Time: params.Timestamp,
|
|
BaseFee: params.BaseFeePerGas,
|
|
Extra: params.ExtraData,
|
|
MixDigest: params.Random,
|
|
WithdrawalsHash: ¶ms.WithdrawalsHash,
|
|
})
|
|
} else {
|
|
block, err = engine.ExecutableDataToBlock(params, versionedHashes, beaconRoot, requests)
|
|
if err != nil {
|
|
bgu := "nil"
|
|
if params.BlobGasUsed != nil {
|
|
bgu = strconv.Itoa(int(*params.BlobGasUsed))
|
|
}
|
|
ebg := "nil"
|
|
if params.ExcessBlobGas != nil {
|
|
ebg = strconv.Itoa(int(*params.ExcessBlobGas))
|
|
}
|
|
log.Warn("Invalid NewPayload params",
|
|
"params.Number", params.Number,
|
|
"params.ParentHash", params.ParentHash,
|
|
"params.BlockHash", params.BlockHash,
|
|
"params.StateRoot", params.StateRoot,
|
|
"params.FeeRecipient", params.FeeRecipient,
|
|
"params.LogsBloom", common.PrettyBytes(params.LogsBloom),
|
|
"params.Random", params.Random,
|
|
"params.GasLimit", params.GasLimit,
|
|
"params.GasUsed", params.GasUsed,
|
|
"params.Timestamp", params.Timestamp,
|
|
"params.ExtraData", common.PrettyBytes(params.ExtraData),
|
|
"params.BaseFeePerGas", params.BaseFeePerGas,
|
|
"params.BlobGasUsed", bgu,
|
|
"params.ExcessBlobGas", ebg,
|
|
"len(params.Transactions)", len(params.Transactions),
|
|
"len(params.Withdrawals)", len(params.Withdrawals),
|
|
"beaconRoot", beaconRoot,
|
|
"len(requests)", len(requests),
|
|
"error", err)
|
|
return api.invalid(err, nil), nil
|
|
}
|
|
}
|
|
|
|
// Stash away the last update to warn the user if the beacon client goes offline
|
|
api.lastNewPayloadLock.Lock()
|
|
api.lastNewPayloadUpdate = time.Now()
|
|
api.lastNewPayloadLock.Unlock()
|
|
|
|
// If we already have the block locally, ignore the entire execution and just
|
|
// return a fake success.
|
|
if block := api.eth.BlockChain().GetBlockByHash(params.BlockHash); block != nil {
|
|
log.Warn("Ignoring already known beacon payload", "number", params.Number, "hash", params.BlockHash, "age", common.PrettyAge(time.Unix(int64(block.Time()), 0)))
|
|
hash := block.Hash()
|
|
return engine.PayloadStatusV1{Status: engine.VALID, LatestValidHash: &hash}, nil
|
|
}
|
|
// If this block was rejected previously, keep rejecting it
|
|
if res := api.checkInvalidAncestor(block.Hash(), block.Hash()); res != nil {
|
|
return *res, nil
|
|
}
|
|
// If the parent is missing, we - in theory - could trigger a sync, but that
|
|
// would also entail a reorg. That is problematic if multiple sibling blocks
|
|
// are being fed to us, and even more so, if some semi-distant uncle shortens
|
|
// our live chain. As such, payload execution will not permit reorgs and thus
|
|
// will not trigger a sync cycle. That is fine though, if we get a fork choice
|
|
// update after legit payload executions.
|
|
parent := api.eth.BlockChain().GetBlock(block.ParentHash(), block.NumberU64()-1)
|
|
if parent == nil {
|
|
return api.delayPayloadImport(block), nil
|
|
}
|
|
// CHANGE(taiko): a block that has the same timestamp as its parents is
|
|
// allowed in Taiko protocol.
|
|
if api.eth.BlockChain().Config().Taiko {
|
|
if block.Time() < parent.Time() {
|
|
log.Warn("Invalid timestamp", "parent", block.Time(), "block", block.Time())
|
|
return api.invalid(errors.New("invalid timestamp"), parent.Header()), nil
|
|
}
|
|
} else {
|
|
if block.Time() <= parent.Time() {
|
|
log.Warn("Invalid timestamp", "parent", block.Time(), "block", block.Time())
|
|
return api.invalid(errors.New("invalid timestamp"), parent.Header()), nil
|
|
}
|
|
}
|
|
// Another corner case: if the node is in snap sync mode, but the CL client
|
|
// tries to make it import a block. That should be denied as pushing something
|
|
// into the database directly will conflict with the assumptions of snap sync
|
|
// that it has an empty db that it can fill itself.
|
|
if api.eth.SyncMode() != ethconfig.FullSync {
|
|
return api.delayPayloadImport(block), nil
|
|
}
|
|
if !api.eth.BlockChain().HasBlockAndState(block.ParentHash(), block.NumberU64()-1) {
|
|
api.remoteBlocks.put(block.Hash(), block.Header())
|
|
log.Warn("State not available, ignoring new payload")
|
|
return engine.PayloadStatusV1{Status: engine.ACCEPTED}, nil
|
|
}
|
|
log.Trace("Inserting block without sethead", "hash", block.Hash(), "number", block.Number())
|
|
proofs, err := api.eth.BlockChain().InsertBlockWithoutSetHead(block, witness)
|
|
if err != nil {
|
|
log.Warn("NewPayload: inserting block failed", "error", err)
|
|
|
|
api.invalidLock.Lock()
|
|
api.invalidBlocksHits[block.Hash()] = 1
|
|
api.invalidTipsets[block.Hash()] = block.Header()
|
|
api.invalidLock.Unlock()
|
|
|
|
return api.invalid(err, parent.Header()), nil
|
|
}
|
|
hash := block.Hash()
|
|
|
|
// If witness collection was requested, inject that into the result too
|
|
var ow *hexutil.Bytes
|
|
if proofs != nil {
|
|
ow = new(hexutil.Bytes)
|
|
*ow, _ = rlp.EncodeToBytes(proofs)
|
|
}
|
|
return engine.PayloadStatusV1{Status: engine.VALID, Witness: ow, LatestValidHash: &hash}, nil
|
|
}
|
|
|
|
func (api *ConsensusAPI) executeStatelessPayload(params engine.ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, requests [][]byte, opaqueWitness hexutil.Bytes) (engine.StatelessPayloadStatusV1, error) {
|
|
log.Trace("Engine API request received", "method", "ExecuteStatelessPayload", "number", params.Number, "hash", params.BlockHash)
|
|
block, err := engine.ExecutableDataToBlockNoHash(params, versionedHashes, beaconRoot, requests)
|
|
if err != nil {
|
|
bgu := "nil"
|
|
if params.BlobGasUsed != nil {
|
|
bgu = strconv.Itoa(int(*params.BlobGasUsed))
|
|
}
|
|
ebg := "nil"
|
|
if params.ExcessBlobGas != nil {
|
|
ebg = strconv.Itoa(int(*params.ExcessBlobGas))
|
|
}
|
|
log.Warn("Invalid ExecuteStatelessPayload params",
|
|
"params.Number", params.Number,
|
|
"params.ParentHash", params.ParentHash,
|
|
"params.BlockHash", params.BlockHash,
|
|
"params.StateRoot", params.StateRoot,
|
|
"params.FeeRecipient", params.FeeRecipient,
|
|
"params.LogsBloom", common.PrettyBytes(params.LogsBloom),
|
|
"params.Random", params.Random,
|
|
"params.GasLimit", params.GasLimit,
|
|
"params.GasUsed", params.GasUsed,
|
|
"params.Timestamp", params.Timestamp,
|
|
"params.ExtraData", common.PrettyBytes(params.ExtraData),
|
|
"params.BaseFeePerGas", params.BaseFeePerGas,
|
|
"params.BlobGasUsed", bgu,
|
|
"params.ExcessBlobGas", ebg,
|
|
"len(params.Transactions)", len(params.Transactions),
|
|
"len(params.Withdrawals)", len(params.Withdrawals),
|
|
"beaconRoot", beaconRoot,
|
|
"len(requests)", len(requests),
|
|
"error", err)
|
|
errorMsg := err.Error()
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID, ValidationError: &errorMsg}, nil
|
|
}
|
|
witness := new(stateless.Witness)
|
|
if err := rlp.DecodeBytes(opaqueWitness, witness); err != nil {
|
|
log.Warn("Invalid ExecuteStatelessPayload witness", "err", err)
|
|
errorMsg := err.Error()
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID, ValidationError: &errorMsg}, nil
|
|
}
|
|
// Stash away the last update to warn the user if the beacon client goes offline
|
|
api.lastNewPayloadLock.Lock()
|
|
api.lastNewPayloadUpdate = time.Now()
|
|
api.lastNewPayloadLock.Unlock()
|
|
|
|
log.Trace("Executing block statelessly", "number", block.Number(), "hash", params.BlockHash)
|
|
stateRoot, receiptRoot, err := core.ExecuteStateless(api.eth.BlockChain().Config(), vm.Config{}, block, witness)
|
|
if err != nil {
|
|
log.Warn("ExecuteStatelessPayload: execution failed", "err", err)
|
|
errorMsg := err.Error()
|
|
return engine.StatelessPayloadStatusV1{Status: engine.INVALID, ValidationError: &errorMsg}, nil
|
|
}
|
|
return engine.StatelessPayloadStatusV1{Status: engine.VALID, StateRoot: stateRoot, ReceiptsRoot: receiptRoot}, nil
|
|
}
|
|
|
|
// delayPayloadImport stashes the given block away for import at a later time,
|
|
// either via a forkchoice update or a sync extension. This method is meant to
|
|
// be called by the newpayload command when the block seems to be ok, but some
|
|
// prerequisite prevents it from being processed (e.g. no parent, or snap sync).
|
|
func (api *ConsensusAPI) delayPayloadImport(block *types.Block) engine.PayloadStatusV1 {
|
|
// Sanity check that this block's parent is not on a previously invalidated
|
|
// chain. If it is, mark the block as invalid too.
|
|
if res := api.checkInvalidAncestor(block.ParentHash(), block.Hash()); res != nil {
|
|
return *res
|
|
}
|
|
// Stash the block away for a potential forced forkchoice update to it
|
|
// at a later time.
|
|
api.remoteBlocks.put(block.Hash(), block.Header())
|
|
|
|
// Although we don't want to trigger a sync, if there is one already in
|
|
// progress, try to extend it with the current payload request to relieve
|
|
// some strain from the forkchoice update.
|
|
err := api.eth.Downloader().BeaconExtend(api.eth.SyncMode(), block.Header())
|
|
if err == nil {
|
|
log.Debug("Payload accepted for sync extension", "number", block.NumberU64(), "hash", block.Hash())
|
|
return engine.PayloadStatusV1{Status: engine.SYNCING}
|
|
}
|
|
// Either no beacon sync was started yet, or it rejected the delivered
|
|
// payload as non-integratable on top of the existing sync. We'll just
|
|
// have to rely on the beacon client to forcefully update the head with
|
|
// a forkchoice update request.
|
|
if api.eth.SyncMode() == ethconfig.FullSync {
|
|
// In full sync mode, failure to import a well-formed block can only mean
|
|
// that the parent state is missing and the syncer rejected extending the
|
|
// current cycle with the new payload.
|
|
log.Warn("Ignoring payload with missing parent", "number", block.NumberU64(), "hash", block.Hash(), "parent", block.ParentHash(), "reason", err)
|
|
} else {
|
|
// In non-full sync mode (i.e. snap sync) all payloads are rejected until
|
|
// snap sync terminates as snap sync relies on direct database injections
|
|
// and cannot afford concurrent out-if-band modifications via imports.
|
|
log.Warn("Ignoring payload while snap syncing", "number", block.NumberU64(), "hash", block.Hash(), "reason", err)
|
|
}
|
|
return engine.PayloadStatusV1{Status: engine.SYNCING}
|
|
}
|
|
|
|
// setInvalidAncestor is a callback for the downloader to notify us if a bad block
|
|
// is encountered during the async sync.
|
|
func (api *ConsensusAPI) setInvalidAncestor(invalid *types.Header, origin *types.Header) {
|
|
api.invalidLock.Lock()
|
|
defer api.invalidLock.Unlock()
|
|
|
|
api.invalidTipsets[origin.Hash()] = invalid
|
|
api.invalidBlocksHits[invalid.Hash()]++
|
|
}
|
|
|
|
// checkInvalidAncestor checks whether the specified chain end links to a known
|
|
// bad ancestor. If yes, it constructs the payload failure response to return.
|
|
func (api *ConsensusAPI) checkInvalidAncestor(check common.Hash, head common.Hash) *engine.PayloadStatusV1 {
|
|
api.invalidLock.Lock()
|
|
defer api.invalidLock.Unlock()
|
|
|
|
// If the hash to check is unknown, return valid
|
|
invalid, ok := api.invalidTipsets[check]
|
|
if !ok {
|
|
return nil
|
|
}
|
|
// If the bad hash was hit too many times, evict it and try to reprocess in
|
|
// the hopes that we have a data race that we can exit out of.
|
|
badHash := invalid.Hash()
|
|
|
|
api.invalidBlocksHits[badHash]++
|
|
if api.invalidBlocksHits[badHash] >= invalidBlockHitEviction {
|
|
log.Warn("Too many bad block import attempt, trying", "number", invalid.Number, "hash", badHash)
|
|
delete(api.invalidBlocksHits, badHash)
|
|
|
|
for descendant, badHeader := range api.invalidTipsets {
|
|
if badHeader.Hash() == badHash {
|
|
delete(api.invalidTipsets, descendant)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
// Not too many failures yet, mark the head of the invalid chain as invalid
|
|
if check != head {
|
|
log.Warn("Marked new chain head as invalid", "hash", head, "badnumber", invalid.Number, "badhash", badHash)
|
|
for len(api.invalidTipsets) >= invalidTipsetsCap {
|
|
for key := range api.invalidTipsets {
|
|
delete(api.invalidTipsets, key)
|
|
break
|
|
}
|
|
}
|
|
api.invalidTipsets[head] = invalid
|
|
}
|
|
// If the last valid hash is the terminal pow block, return 0x0 for latest valid hash
|
|
lastValid := &invalid.ParentHash
|
|
if header := api.eth.BlockChain().GetHeader(invalid.ParentHash, invalid.Number.Uint64()-1); header != nil && header.Difficulty.Sign() != 0 {
|
|
lastValid = &common.Hash{}
|
|
}
|
|
failure := "links to previously rejected block"
|
|
return &engine.PayloadStatusV1{
|
|
Status: engine.INVALID,
|
|
LatestValidHash: lastValid,
|
|
ValidationError: &failure,
|
|
}
|
|
}
|
|
|
|
// invalid returns a response "INVALID" with the latest valid hash supplied by latest.
|
|
func (api *ConsensusAPI) invalid(err error, latestValid *types.Header) engine.PayloadStatusV1 {
|
|
var currentHash *common.Hash
|
|
if latestValid != nil {
|
|
if latestValid.Difficulty.BitLen() != 0 {
|
|
// Set latest valid hash to 0x0 if parent is PoW block
|
|
currentHash = &common.Hash{}
|
|
} else {
|
|
// Otherwise set latest valid hash to parent hash
|
|
h := latestValid.Hash()
|
|
currentHash = &h
|
|
}
|
|
}
|
|
errorMsg := err.Error()
|
|
return engine.PayloadStatusV1{Status: engine.INVALID, LatestValidHash: currentHash, ValidationError: &errorMsg}
|
|
}
|
|
|
|
// heartbeat loops indefinitely, and checks if there have been beacon client updates
|
|
// received in the last while. If not - or if they but strange ones - it warns the
|
|
// user that something might be off with their consensus node.
|
|
//
|
|
// TODO(karalabe): Spin this goroutine down somehow
|
|
func (api *ConsensusAPI) heartbeat() {
|
|
// Sleep a bit on startup since there's obviously no beacon client yet
|
|
// attached, so no need to print scary warnings to the user.
|
|
time.Sleep(beaconUpdateStartupTimeout)
|
|
|
|
// If the network is not yet merged/merging, don't bother continuing.
|
|
if api.eth.BlockChain().Config().TerminalTotalDifficulty == nil {
|
|
return
|
|
}
|
|
|
|
var offlineLogged time.Time
|
|
|
|
for {
|
|
// Sleep a bit and retrieve the last known consensus updates
|
|
time.Sleep(5 * time.Second)
|
|
|
|
api.lastTransitionLock.Lock()
|
|
lastTransitionUpdate := api.lastTransitionUpdate
|
|
api.lastTransitionLock.Unlock()
|
|
|
|
api.lastForkchoiceLock.Lock()
|
|
lastForkchoiceUpdate := api.lastForkchoiceUpdate
|
|
api.lastForkchoiceLock.Unlock()
|
|
|
|
api.lastNewPayloadLock.Lock()
|
|
lastNewPayloadUpdate := api.lastNewPayloadUpdate
|
|
api.lastNewPayloadLock.Unlock()
|
|
|
|
// If there have been no updates for the past while, warn the user
|
|
// that the beacon client is probably offline
|
|
if time.Since(lastForkchoiceUpdate) <= beaconUpdateConsensusTimeout || time.Since(lastNewPayloadUpdate) <= beaconUpdateConsensusTimeout {
|
|
offlineLogged = time.Time{}
|
|
continue
|
|
}
|
|
if time.Since(offlineLogged) > beaconUpdateWarnFrequency {
|
|
if lastForkchoiceUpdate.IsZero() && lastNewPayloadUpdate.IsZero() {
|
|
if lastTransitionUpdate.IsZero() {
|
|
log.Warn("Post-merge network, but no beacon client seen. Please launch one to follow the chain!")
|
|
} else {
|
|
log.Warn("Beacon client online, but never received consensus updates. Please ensure your beacon client is operational to follow the chain!")
|
|
}
|
|
} else {
|
|
log.Warn("Beacon client online, but no consensus updates received in a while. Please fix your beacon client to follow the chain!")
|
|
}
|
|
offlineLogged = time.Now()
|
|
}
|
|
continue
|
|
}
|
|
}
|
|
|
|
// ExchangeCapabilities returns the current methods provided by this node.
|
|
func (api *ConsensusAPI) ExchangeCapabilities([]string) []string {
|
|
return caps
|
|
}
|
|
|
|
// GetClientVersionV1 exchanges client version data of this node.
|
|
func (api *ConsensusAPI) GetClientVersionV1(info engine.ClientVersionV1) []engine.ClientVersionV1 {
|
|
log.Trace("Engine API request received", "method", "GetClientVersionV1", "info", info.String())
|
|
commit := make([]byte, 4)
|
|
if vcs, ok := version.VCS(); ok {
|
|
commit = common.FromHex(vcs.Commit)[0:4]
|
|
}
|
|
return []engine.ClientVersionV1{
|
|
{
|
|
Code: engine.ClientCode,
|
|
Name: engine.ClientName,
|
|
Version: version.WithMeta,
|
|
Commit: hexutil.Encode(commit),
|
|
},
|
|
}
|
|
}
|
|
|
|
// GetPayloadBodiesByHashV1 implements engine_getPayloadBodiesByHashV1 which allows for retrieval of a list
|
|
// of block bodies by the engine api.
|
|
func (api *ConsensusAPI) GetPayloadBodiesByHashV1(hashes []common.Hash) []*engine.ExecutionPayloadBody {
|
|
bodies := make([]*engine.ExecutionPayloadBody, len(hashes))
|
|
for i, hash := range hashes {
|
|
block := api.eth.BlockChain().GetBlockByHash(hash)
|
|
bodies[i] = getBody(block)
|
|
}
|
|
return bodies
|
|
}
|
|
|
|
// GetPayloadBodiesByHashV2 implements engine_getPayloadBodiesByHashV1 which allows for retrieval of a list
|
|
// of block bodies by the engine api.
|
|
func (api *ConsensusAPI) GetPayloadBodiesByHashV2(hashes []common.Hash) []*engine.ExecutionPayloadBody {
|
|
bodies := make([]*engine.ExecutionPayloadBody, len(hashes))
|
|
for i, hash := range hashes {
|
|
block := api.eth.BlockChain().GetBlockByHash(hash)
|
|
bodies[i] = getBody(block)
|
|
}
|
|
return bodies
|
|
}
|
|
|
|
// GetPayloadBodiesByRangeV1 implements engine_getPayloadBodiesByRangeV1 which allows for retrieval of a range
|
|
// of block bodies by the engine api.
|
|
func (api *ConsensusAPI) GetPayloadBodiesByRangeV1(start, count hexutil.Uint64) ([]*engine.ExecutionPayloadBody, error) {
|
|
return api.getBodiesByRange(start, count)
|
|
}
|
|
|
|
// GetPayloadBodiesByRangeV2 implements engine_getPayloadBodiesByRangeV1 which allows for retrieval of a range
|
|
// of block bodies by the engine api.
|
|
func (api *ConsensusAPI) GetPayloadBodiesByRangeV2(start, count hexutil.Uint64) ([]*engine.ExecutionPayloadBody, error) {
|
|
return api.getBodiesByRange(start, count)
|
|
}
|
|
|
|
func (api *ConsensusAPI) getBodiesByRange(start, count hexutil.Uint64) ([]*engine.ExecutionPayloadBody, error) {
|
|
if start == 0 || count == 0 {
|
|
return nil, engine.InvalidParams.With(fmt.Errorf("invalid start or count, start: %v count: %v", start, count))
|
|
}
|
|
if count > 1024 {
|
|
return nil, engine.TooLargeRequest.With(fmt.Errorf("requested count too large: %v", count))
|
|
}
|
|
// limit count up until current
|
|
current := api.eth.BlockChain().CurrentBlock().Number.Uint64()
|
|
last := uint64(start) + uint64(count) - 1
|
|
if last > current {
|
|
last = current
|
|
}
|
|
bodies := make([]*engine.ExecutionPayloadBody, 0, uint64(count))
|
|
for i := uint64(start); i <= last; i++ {
|
|
block := api.eth.BlockChain().GetBlockByNumber(i)
|
|
bodies = append(bodies, getBody(block))
|
|
}
|
|
return bodies, nil
|
|
}
|
|
|
|
func getBody(block *types.Block) *engine.ExecutionPayloadBody {
|
|
if block == nil {
|
|
return nil
|
|
}
|
|
|
|
var result engine.ExecutionPayloadBody
|
|
|
|
result.TransactionData = make([]hexutil.Bytes, len(block.Transactions()))
|
|
for j, tx := range block.Transactions() {
|
|
result.TransactionData[j], _ = tx.MarshalBinary()
|
|
}
|
|
|
|
// Post-shanghai withdrawals MUST be set to empty slice instead of nil
|
|
result.Withdrawals = block.Withdrawals()
|
|
if block.Withdrawals() == nil && block.Header().WithdrawalsHash != nil {
|
|
result.Withdrawals = []*types.Withdrawal{}
|
|
}
|
|
|
|
return &result
|
|
}
|
|
|
|
// convertRequests converts a hex requests slice to plain [][]byte.
|
|
func convertRequests(hex []hexutil.Bytes) [][]byte {
|
|
if hex == nil {
|
|
return nil
|
|
}
|
|
req := make([][]byte, len(hex))
|
|
for i := range hex {
|
|
req[i] = hex[i]
|
|
}
|
|
return req
|
|
}
|
|
|
|
// validateRequests checks that requests are ordered by their type and are not empty.
|
|
func validateRequests(requests [][]byte) error {
|
|
for i, req := range requests {
|
|
// No empty requests.
|
|
if len(req) < 2 {
|
|
return fmt.Errorf("empty request: %v", req)
|
|
}
|
|
// Check that requests are ordered by their type.
|
|
// Each type must appear only once.
|
|
if i > 0 && req[0] <= requests[i-1][0] {
|
|
return fmt.Errorf("invalid request order: %v", req)
|
|
}
|
|
}
|
|
return nil
|
|
}
|