mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-02 10:03:45 +00:00
* accounts/usbwallet: support dynamic tx (#30180) Adds support non-legacy transaction-signing using ledger --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * signer/core: extended support for EIP-712 array types (#30620) This change updates the EIP-712 implementation to resolve [#30619](https://github.com/ethereum/go-ethereum/issues/30619). The test cases have been repurposed from the ethers.js [repository](https://github.com/ethers-io/ethers.js/blob/main/testcases/typed-data.json.gz), but have been updated to remove tests that don't have a valid domain separator; EIP-712 messages without a domain separator are not supported by geth. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd/evm: benchmarking via `statetest` command + filter by name, index and fork (#30442) When `evm statetest --bench` is specified, benchmark the execution similarly to `evm run`. Also adds the ability to filter tests by name, index and fork. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * beacon/blsync: remove cli dependencies (#30720) This PR moves chain config related code (config file processing, fork logic, network defaults) from `beacon/types` and `beacon/blsync` into `beacon/params` while the command line flag logic of the chain config is moved into `cmd/utils`, thereby removing the cli dependencies from package `beacon` and its sub-packages. * core/state: invoke OnCodeChange-hook on selfdestruct (#30686) This change invokes the OnCodeChange hook when selfdestruct operation is performed, and a contract is removed. This is an event which can be consumed by tracers. * trie/utils: remove unneeded initialization (#30472) * travis: build and upload RISC-V docker images too (#30739) Requested by @barnabasbusa * core/state, triedb/database: refactor state reader (#30712) Co-authored-by: Martin HS <martin@swende.se> * eth/protocols/eth: add ETH68 protocol handler fuzzers (#30417) Adds a protocol handler fuzzer to fuzz the ETH68 protocol handlers * tests: fix test panic (#30741) Fix panic in tests * p2p/netutil: unittests for addrutil (#30439) add unit tests for `p2p/addrutil` --------- Co-authored-by: Martin HS <martin@swende.se> * docs: fix typo (#30740) fixes a typo on one of the postmortems * core/state: tests on the binary iterator (#30754) Fixes an error in the binary iterator, adds additional testcases --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/geth: remove unlock commandline flag (#30737) This is one further step towards removing account management from `geth`. This PR deprecates the flag `unlock`, and makes the flag moot: unlock via geth is no longer possible. * build: upgrade -dlgo version to Go 1.23.3 (#30742) New release: https://groups.google.com/g/golang-announce/c/X5KodEJYuqI * core: fix typos (#30767) * all: remove kilic dependency from bls12381 fuzzers (#30296) The [kilic](https://github.com/kilic/bls12-381) bls12381 implementation has been archived. It shouldn't be necessary to include it as a fuzzing target any longer. This also adds fuzzers for G1/G2 mul that use inputs that are guaranteed to be valid. Previously, we just did random input fuzzing for these precompiles. * core/txpool, eth/catalyst: clear transaction pool in Rollback (#30534) This adds an API method `DropTransactions` to legacy pool, blob pool and txpool interface. This method removes all txs currently tracked in the pools. It modifies the simulated beacon to use the new method in `Rollback` which removes previous hacky implementation that also erroneously reset the gas tip to 1 gwei. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * rpc: run tests in parallel (#30384) Continuation of https://github.com/ethereum/go-ethereum/pull/30381 * version: go-ethereum v1.14.12 stable * version: begin v1.14.13 release cycle * version: fix typo in v1.14.13 release cycle name * core/vm/program: evm bytecode-building utility (#30725) In many cases, there is a need to create somewhat nontrivial bytecode. A recent example is the verkle statetests, where we want a `CREATE2`- op to create a contract, which can then be invoked, and when invoked does a selfdestruct-to-self. It is overkill to go full solidity, but it is also a bit tricky do assemble this by concatenating bytes. This PR takes an approach that has been used in in goevmlab for several years. Using this utility, the case can be expressed as: ```golang // Some runtime code runtime := program.New().Ops(vm.ADDRESS, vm.SELFDESTRUCT).Bytecode() // A constructor returning the runtime code initcode := program.New().ReturnData(runtime).Bytecode() // A factory invoking the constructor outer := program.New().Create2AndCall(initcode, nil).Bytecode() ``` We have a lot of places in the codebase where we concatenate bytes, cast from `vm.OpCode` . By taking tihs approach instead, thos places can be made a bit more maintainable/robust. * core, eth, internal, cmd: rework EVM constructor (#30745) This pull request refactors the EVM constructor by removing the TxContext parameter. The EVM object is frequently overused. Ideally, only a single EVM instance should be created and reused throughout the entire state transition of a block, with the transaction context switched as needed by calling evm.SetTxContext. Unfortunately, in some parts of the code, the EVM object is repeatedly created, resulting in unnecessary complexity. This pull request is the first step towards gradually improving and simplifying this setup. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * core, eth, internal, miner: remove unnecessary parameters (#30776) Follow-up to #30745 , this change removes some unnecessary parameters. * internal/ethapi: remove double map-clone (#30788) `ActivePrecompiledContracts()` clones the precompiled contract map, thus its callsite does not need to clone it * all: typos in comments (#30779) fixes some typos * trie: replace custom logic with bytes.HasPrefix (#30771) in `trie` - Replace custom logic with `bytes.HasPrefix` - Remove unnecessary code in `GetNode` * core, triedb: remove destruct flag in state snapshot (#30752) This pull request removes the destruct flag from the state snapshot to simplify the code. Previously, this flag indicated that an account was removed during a state transition, making all associated storage slots inaccessible. Because storage deletion can involve a large number of slots, the actual deletion is deferred until the end of the process, where it is handled in batches. With the deprecation of self-destruct in the Cancun fork, storage deletions are no longer expected. Historically, the largest storage deletion event in Ethereum was around 15 megabytes—manageable in memory. In this pull request, the single destruct flag is replaced by a set of deletion markers for individual storage slots. Each deleted storage slot will now appear in the Storage set with a nil value. This change will simplify a lot logics, such as storage accessing, storage flushing, storage iteration and so on. * internal/flags: fix "flag redefined" bug for alias on custom flags (#30796) This change fixes a bug on the `DirectoryFlag` and the `BigFlag`, which would trigger a `panic` with the message "flag redefined" in case an alias was added to such a flag. * eth/tracers/logger: fix json-logger output missing (#30804) Fixes a flaw introduced in https://github.com/ethereum/go-ethereum/pull/29795 , discovered while reviewing https://github.com/ethereum/go-ethereum/pull/30633 . * eth/tracers/logger: improve markdown logger (#30805) This PR improves the output of the markdown logger a bit. - Remove `RStack` field, - Move `Stack` last, since it may have very large vertical expansion - Make the pre- and post-exec metadata structured into a bullet-list * internal/ethapi: remove double map-clone (#30803) Similar to https://github.com/ethereum/go-ethereum/pull/30788 * accounts/abi: fix MakeTopics mutation of big.Int inputs (#30785) #28764 updated `func MakeTopics` to support negative `*big.Int`s. However, it also changed the behavior of the function from just _reading_ the input `*big.Int` via `Bytes()`, to leveraging `big.U256Bytes` which is documented as being _destructive_: This change updates `MakeTopics` to not mutate the original, and also applies the same change in signer/core/apitypes. * core/state/snapshot: simplify snapshot rebuild (#30772) This PR is purely for improved readability; I was doing work involving the file and think this may help others who are trying to understand what's going on. 1. `snapshot.Tree.Rebuild()` now returns a function that blocks until regeneration is complete, allowing `Tree.waitBuild()` to be removed entirely as all it did was search for the `done` channel behind this new function. 2. Its usage inside `New()` is also simplified by (a) only waiting if `!AsyncBuild`; and (b) avoiding the double negative of `if !NoBuild`. --------- Co-authored-by: Martin HS <martin@swende.se> * eth/ethconfig: improve error message if TTD missing (#30807) This updates the message you get when trying to initialize Geth with genesis.json that doesn't have `terminalTotalDifficulty`. The previous message was a bit obscure, I had to check the code to find out what the problem was. * core/tracing: add GetCodeHash to StateDB (#30784) This PR extends the tracing.StateDB interface by adding a GetCodeHash function. * Revert "core/state/snapshot: simplify snapshot rebuild (#30772)" (#30810) This reverts commit23800122b3. The original pull request introduces a bug and some flaky tests are detected because of this flaw. ``` --- FAIL: TestRecoverSnapshotFromWipingCrash (0.27s) blockchain_snapshot_test.go:158: The disk layer is not integrated snapshot is not constructed {"pc":0,"op":88,"gas":"0x7148","gasCost":"0x2","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PC"} {"pc":1,"op":255,"gas":"0x7146","gasCost":"0x1db0","memSize":0,"stack":["0x0"],"depth":1,"refund":0,"opName":"SELFDESTRUCT"} {"output":"","gasUsed":"0x0"} {"output":"","gasUsed":"0x1db2"} {"pc":0,"op":116,"gas":"0x13498","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH21"} ``` Before the original PR, the snapshot would block the function until the disk layer was fully generated under the following conditions: (a) explicitly required by users with `AsyncBuild = false`. (b) the snapshot was being fully rebuilt or *the disk layer generation had resumed*. Unfortunately, with the changes introduced in that PR, the snapshot no longer waits for disk layer generation to complete if the generation is resumed. It brings lots of uncertainty and breaks this tiny debug feature. * cmd/evm: don't reuse state between iterations, show errors (#30780) Reusing state between benchmark iterations resulted in inconsistent results across runs, which surfaced in https://github.com/ethereum/go-ethereum/issues/30778 . If these errors are triggered again, they will now trigger panic. --------- Co-authored-by: Martin HS <martin@swende.se> * core: better document reason for dropping error on return (#30811) Add a comment for error return of nil Signed-off-by: wangjingcun <wangjingcun@aliyun.com> * core/state/snapshot: handle legacy journal (#30802) This workaround is meant to minimize the possibility for snapshot generation once the geth node upgrades to new version (specifically #30752 ) In #30752, the journal format in state snapshot is modified by removing the destruct set. Therefore, the existing old format (version = 0) will be discarded and all in-memory layers will be lost. Unfortunately, the lost in-memory layers can't be recovered by some other approaches, and the entire state snapshot will be regenerated (it will last about 2.5 hours). This pull request introduces a workaround to adopt the legacy journal if the destruct set contained is empty. Since self-destruction has been deprecated following the cancun fork, the destruct set is expected to be nil for layers above the fork block. However, an exception occurs during contract deployment: pre-funded accounts may self-destruct, causing accounts with non-zero balances to be removed from the state. For example, https://etherscan.io/tx/0xa087333d83f0cd63b96bdafb686462e1622ce25f40bd499e03efb1051f31fe49). For nodes with a fully synced state, the legacy journal is likely compatible with the updated definition, eliminating the need for regeneration. Unfortunately, nodes performing a full sync of historical chain segments or encountering pre-funded account deletions may face incompatibilities, leading to automatic snapshot regeneration. * trie: combine validation loops in VerifyRangeProof (#30823) Small optimization. It's guaranteed that `len(keys)` == `len(values)`, so we can combine the checks in a single loop rather than 2 separate loops. * all: exclude empty outputs in requests commitment (#30670) Implements changes from these spec PRs: - https://github.com/ethereum/EIPs/pull/8989 - https://github.com/ethereum/execution-apis/pull/599 * cmd/bootnode: remove bootnode utility (#30813) Since we don't really support custom networks anymore, we don't need the bootnode utility. In case a discovery-only node is wanted, it can still be run using cmd/devp2p. * core/types: add length check in CalcRequestsHash (#30829) The existing implementation is correct when building and verifying blocks, since we will only collect non-empty requests into the block requests list. But it isn't correct for cases where a requests list containing empty items is sent by the consensus layer on the engine API. We want to ensure that empty requests do not cause a difference in validation there, so the commitment computation should explicitly skip them. * triedb/pathdb: track flat state changes in pathdb (snapshot integration pt 2) (#30643) This pull request ports some changes from the main state snapshot integration one, specifically introducing the flat state tracking in pathdb. Note, the tracked flat state changes are only held in memory and won't be persisted in the disk. Meanwhile, the correspoding state retrieval in persistent state is also not supported yet. The states management in disk is more complicated and will be implemented in a separate pull request. Part 1: https://github.com/ethereum/go-ethereum/pull/30752 * core/state: introduce code reader interface (#30816) This PR introduces a `ContractCodeReader` interface with functions defined: type ContractCodeReader interface { Code(addr common.Address, codeHash common.Hash) ([]byte, error) CodeSize(addr common.Address, codeHash common.Hash) (int, error) } This interface can be implemented in various ways. Although the codebase currently includes only one implementation, additional implementations could be created for different purposes and scenarios, such as a code reader designed for the Verkle tree approach or one that reads code from the witness. *Notably, this interface modifies the function’s semantics. If the contract code is not found, no error will be returned. An error should only be returned in the event of an unexpected issue, primarily for future implementations.* The original state.Reader interface is extended with ContractCodeReader methods, it gives us more flexibility to manipulate the reader with additional logic on top, e.g. Hooks. type Reader interface { ContractCodeReader StateReader } --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core: switch EVM tx context in ApplyMessage (#30809) This change relocates the EVM tx context switching to the ApplyMessage function. With this change, we can remove a lot of EVM.SetTxContext calls before message execution. ### Tracing API changes - This PR replaces the `GasPrice` field of the `VMContext` struct with `BaseFee`. Users may instead take the effective gas price from `tx.EffectiveGasTipValue(env.BaseFee)`. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * eth/tracers: fix state hooks in API (#30830) When a tx/block was being traced through the API the state hooks weren't being called as they should. This is due to #30745 moving the hooked statedb one level up in the state processor. This PR fixes that. --------- Co-authored-by: Martin HS <martin@swende.se> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/evm: improve block/state test runner (#30633) * unify `staterunner` and `blockrunner` CLI flags, especially around tracing * added support for struct logger or json logging (although having issue #30658) * new --cross-check flag to validate the stateless witness collection / execution matches stateful * adds support for tracing the stateless execution when a tracer is set (to more easily debug differences) * --human for more readable test summary * directory or file input, so if you pass tests/spec-tests/fixtures/blockchain_tests it will execute all blockchain tests * fuzzing: fix oss-fuzz fuzzer (#30845) The fuzzer added recenly to fuzz the eth handler doesn't build on oss-fuzz, because it also has dependencies in the peer_test.go. This change fixes it, I hope, by adding that file also for preprocessing. * internal/debug: rename --trace to --go-execution-trace (#30846) This flag is very rarely needed, so it's OK for it to have a verbose name. The name --trace also conflicts with the concept of EVM tracing, which is much more heavily used. * eth/downloader: move SyncMode to package eth/ethconfig (#30847) Lots of packages depend on eth/downloader just for the SyncMode type. Since we have a dedicated package for eth protocol configuration, it makes more sense to define SyncMode there, turning eth/downloader into more of a leaf package. * CODEOWNERS: add some more entries for auto assignment (#30851) * cmd/evm, eth/tracers: refactor structlogger and make it streaming (#30806) This PR refactors the structlog a bit, making it so that it can be used in a streaming mode. ------------- OBS: this PR makes a change in the input `config` config, the third input-parem field to `debug.traceCall`. Previously, seteting it to e.g. ` {"enableMemory": true, "limit": 1024}` would mean that the response was limited to `1024` items. Since an 'item' may include both memory and storage, the actual size of the response was undertermined. After this change, the response will be limited to `1024` __`bytes`__ (or thereabouts). ----------- The commandline usage of structlog now uses the streaming mode, leaving the non-streaming mode of operation for the eth_Call. There are two benefits of streaming mode 1. Not have to maintain a long list of operations, 2. Not have to duplicate / n-plicate data, e.g. memory / stack / returndata so that each entry has their own private slice. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/tracing: extends tracing.Hooks with OnSystemCallStartV2 (#30786) This PR extends the Hooks interface with a new method, `OnSystemCallStartV2`, which takes `VMContext` as its parameter. Motivation By including `VMContext` as a parameter, the `OnSystemCallStartV2` hook achieves parity with the `OnTxStart` hook in terms of provided insights. This alignment simplifies the inner tracer logic, enabling consistent handling of state changes and internal calls within the same framework. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * trie/utils: ensure master can generate a correct genesis for kaustinen7 (#30856) This imports the following fixes: - update gnark to 1.1.0 - update go-verkle to 0.2.2 - fix: main storage offset bug (gballet/go-ethereum#329) - fix: tree key generation (gballet/go-ethereum#401) --------- Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> * core/txpool: remove unused parameter `local` (#30871) * core/state: enable partial-functional reader (snapshot integration pt 3) (#30650) It's a pull request based on https://github.com/ethereum/go-ethereum/pull/30643 In this pull request, the partial functional state reader is enabled if **legacy snapshot is not enabled**. The tracked flat states in pathdb will be used to serve the state retrievals, as the second implementation to fasten the state access. This pull request should be a noop change in normal cases. * cmd/evm: consolidate evm output switches (#30849) This PR attempts to clean up some ambiguities and quirks from recent changes to evm flag handling. This PR mainly focuses on `evm run` subcommand, to use the same flags for configuring tracing/output options as `statetest/blocktest` does. Additionally, it adds quite a lot of tests for expected outputs of the various subcommands, to avoid accidental changes. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core/vm: remove unnecessary comment (#30887) * metrics, cmd/geth: change init-process of metrics (#30814) This PR modifies how the metrics library handles `Enabled`: previously, the package `init` decided whether to serve real metrics or just dummy-types. This has several drawbacks: - During pkg init, we need to determine whether metrics are enabled or not. So we first hacked in a check if certain geth-specific commandline-flags were enabled. Then we added a similar check for geth-env-vars. Then we almost added a very elaborate check for toml-config-file, plus toml parsing. - Using "real" types and dummy types interchangeably means that everything is hidden behind interfaces. This has a performance penalty, and also it just adds a lot of code. This PR removes the interface stuff, uses concrete types, and allows for the setting of Enabled to happen later. It is still assumed that `metrics.Enable()` is invoked early on. The somewhat 'heavy' operations, such as ticking meters and exp-decay, now checks the enable-flag to prevent resource leak. The change may be large, but it's mostly pretty trivial, and from the last time I gutted the metrics, I ensured that we have fairly good test coverage. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build: update to Go 1.23.4 (#30872) * accounts/abi: support unpacking solidity errors (#30738) This PR adds the error fragments to `func (abi ABI) getArguments` which allows typed decoding of errors. * core/state: remove pointless wrapper functions (#30891) * p2p: fix DiscReason encoding/decoding (#30855) This fixes an issue where the disconnect message was not wrapped in a list. The specification requires it to be a list like any other message. In order to remain compatible with legacy geth versions, we now accept both encodings when parsing a disconnect message. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * internal/ethapi: add block override to estimateGas (#30695) Add block overrides to `eth_estimateGas` to align consistency with `eth_call`. https://github.com/ethereum/go-ethereum/issues/27800#issuecomment-1658186166 Fixes https://github.com/ethereum/go-ethereum/issues/28175 --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * p2p: DNS resolution for static nodes (#30822) Closes #23210 # Context When deploying Geth in Kubernetes with ReplicaSets, we encountered two DNS-related issues affecting node connectivity. First, during startup, Geth tries to resolve DNS names for static nodes too early in the config unmarshaling phase. If peer nodes aren't ready yet (which is common in Kubernetes rolling deployments), this causes an immediate failure: ``` INFO [11-26|10:03:42.816] Starting Geth on Ethereum mainnet... INFO [11-26|10:03:42.817] Bumping default cache on mainnet provided=1024 updated=4096 Fatal: config.toml, line 81: (p2p.Config.StaticNodes) lookup idontexist.geth.node: no such host ``` The second issue comes up when pods get rescheduled to different nodes - their IPs change but peers keep using the initially resolved IP, never updating the DNS mapping. This PR adds proper DNS support for enode:// URLs by deferring resolution to connection time. It also handles DNS failures gracefully instead of failing fatally during startup, making it work better in container environments where IPs are dynamic and peers come and go during rollouts. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * all: implement eip-7702 set code tx (#30078) This PR implements EIP-7702: "Set EOA account code". Specification: https://eips.ethereum.org/EIPS/eip-7702 > Add a new transaction type that adds a list of `[chain_id, address, nonce, y_parity, r, s]` authorization tuples. For each tuple, write a delegation designator `(0xef0100 ++ address)` to the signing account’s code. All code reading operations must load the code pointed to by the designator. --------- Co-authored-by: Mario Vega <marioevz@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com> * trie/pathdb: state iterator (snapshot integration pt 4) (#30654) In this pull request, the state iterator is implemented. It's mostly a copy-paste from the original state snapshot package, but still has some important changes to highlight here: (a) The iterator for the disk layer consists of a diff iterator and a disk iterator. Originally, the disk layer in the state snapshot was a wrapper around the disk, and its corresponding iterator was also a wrapper around the disk iterator. However, due to structural differences, the disk layer iterator is divided into two parts: - The disk iterator, which traverses the content stored on disk. - The diff iterator, which traverses the aggregated state buffer. Checkout `BinaryIterator` and `FastIterator` for more details. (b) The staleness management is improved in the diffAccountIterator and diffStorageIterator Originally, in the `diffAccountIterator`, the layer’s staleness had to be checked within the Next function to ensure the iterator remained usable. Additionally, a read lock on the associated diff layer was required to first retrieve the account blob. This read lock protection is essential to prevent concurrent map read/write. Afterward, a staleness check was performed to ensure the retrieved data was not outdated. The entire logic can be simplified as follows: a loadAccount callback is provided to retrieve account data. If the corresponding state is immutable (e.g., diff layers in the path database), the staleness check can be skipped, and a single account data retrieval is sufficient. However, if the corresponding state is mutable (e.g., the disk layer in the path database), the callback can operate as follows: ```go func(hash common.Hash) ([]byte, error) { dl.lock.RLock() defer dl.lock.RUnlock() if dl.stale { return nil, errSnapshotStale } return dl.buffer.states.mustAccount(hash) } ``` The callback solution can eliminate the complexity for managing concurrency with the read lock for atomic operation. * core/vm, go.mod: update uint256 and use faster method to write to memory (#30868) Updates geth to use the latest uint256, and use faster memory-writer * accounts/abi/bind: make it possible to wait for tx hash (#30079) This change adds methods which makes it possible for to wait for a transaction with a specific hash when deploying contracts during abi bind interaction. --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * core: fixes for Prague fork in GenerateChain (#30924) Adding some missing functionality I noticed while updating the hivechain tool for the Prague fork: - we forgot to process the parent block hash - added `ConsensusLayerRequests` to get the requests list of the block * build(deps): bump golang.org/x/crypto from 0.26.0 to 0.31.0 (#30921) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.26.0 to 0.31.0. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * core/vm: make all opcodes proper type (#30925) Noticed this omission while doing some work on goevmlab. We don't properly type some of the opcodes, but apparently implicit casting works in all the internal usecases. * core/types, internal/ethapi: fixes for prague RPC encoding (#30926) Fixing some issues I found while regenerating RPC tests for Prague: - Authorization signature values were not encoded as hex - `requestsRoot` in block should be `requestsHash` - `authorizationList` should work for `eth_call` * cmd/evm: make evm statetest accept non-json files (#30927) This fixes a regression introduced recently. Without this fix, it's not possible to use statetests without `.json` suffix. This is problematic for goevmlab `minimizer`, which appends the suffix `.min` during processing. * core/types: updates for EIP-7702 API functions (#30933) Here I am proposing two small changes to the exported API for EIP-7702: (1) `Authorization` has a very generic name, but it is in fact only used for one niche use case: authorizing code in a `SetCodeTx`. So I propose calling it `SetCodeAuthorization` instead. The signing function is renamed to `SignSetCode` instead of `SignAuth`. (2) The signing function for authorizations should take key as the first parameter, and the authorization second. The key will almost always be in a variable, while the authorization can be given as a literal. * core/types: rename SetCodeAuthorization 'v' to 'yParity' The API spec requires the name yParity. * cmd/evm: update tests for SetCodeAuthorization JSON encoding change (#30936) Fixing a regression introduced by73a4ecf675, which I accidentally pushed to the master branch directly. * core, core/types: rename AuthList to SetCodeAuthorizations (#30935) As a follow-up to #30933, I propose to also use the SetCode prefix in our internal APIs for the authorization list. * params: update system contracts for prague devnet-5 (#30938) * internal/flags: update copyright year to 2025 (#30976) * crypto/bn256: fix MulScalar (#30974) The `a` parameter should be used in the `MulScalar` function. The upstream cloudflare and google repos have already merged fixes. Reference: *8d7daa0c54* https://github.com/cloudflare/bn256/pull/33 * all: use cmp.Compare (#30958) * eth/tracers/logger: skip system calls (#30923) This commit makes it so that the struct logger will not emit logs while system calls are being executed. This will make it consistent with the JSON and MD loggers. It is as it stands hard to distinguish when system calls are being processed vs when a tx is being processed. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * internal/ethapi: update default simulation timestamp increment to 12 (#30981) Update the default timestamp increment to 12s for `eth_simulate` endpoint * core/rawdb: fix panic in freezer (#30973) Fixes an issue where the node panics when an LStat fails with something other than os.ErrNotExist closes https://github.com/ethereum/go-ethereum/issues/30968 * core/types: improve printList in DeriveSha test (#30969) * eth/protocols/eth: prevent hanging dispatch (#30918) This PR attempts to fix a strange test-failure (timeout) observed on a windows-32 platform. https://ci.appveyor.com/project/ethereum/go-ethereum/builds/51174391/job/d8ascanwwltrlqd5 A goroutine is stuck trying to deliver a response: ``` goroutine 9632 [select, 29 minutes]: github.com/ethereum/go-ethereum/eth/protocols/eth.(*Peer).dispatchResponse(0x314f100, 0x3e5f6d0, 0x3acbb84) C:/projects/go-ethereum/eth/protocols/eth/dispatcher.go:172 +0x2a5 github.com/ethereum/go-ethereum/eth/protocols/eth.handleBlockHeaders({0x12abe68, 0x30021b8}, {0x12a815c, 0x40b41c0}, 0x314f100) C:/projects/go-ethereum/eth/protocols/eth/handlers.go:301 +0x173 github.com/ethereum/go-ethereum/eth/protocols/eth.handleMessage({0x12abe68, 0x30021b8}, 0x314f100) C:/projects/go-ethereum/eth/protocols/eth/handler.go:205 +0x4f6 github.com/ethereum/go-ethereum/eth/protocols/eth.Handle({0x12abe68, 0x30021b8}, 0x314f100) C:/projects/go-ethereum/eth/protocols/eth/handler.go:149 +0x33 github.com/ethereum/go-ethereum/eth.testSnapSyncDisabling.func1(0x314f100) C:/projects/go-ethereum/eth/sync_test.go:65 +0x33 github.com/ethereum/go-ethereum/eth.(*handler).runEthPeer(0x30021b8, 0x314f100, 0x427f648) C:/projects/go-ethereum/eth/handler.go:355 +0xe65 created by github.com/ethereum/go-ethereum/eth.testSnapSyncDisabling in goroutine 11 C:/projects/go-ethereum/eth/sync_test.go:64 +0x54f FAIL github.com/ethereum/go-ethereum/eth 1800.138s ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * cmd/clef: fix JS issues in documentation (#30980) Fixes a couple of js-flaws in the docs * triedb/pathdb: fix tester generator (#30972) This change fixes is a rare bug in test generator: If the run is very unlucky it can use `modifyAccountOp` / `deleteAccountOp` without creating any account, leading to have a trie root same as the parent. This change makes the first operation always be a creation. * README: remove private network section from readme (#31005) * triedb/pathdb: configure different node hasher in pathdb (#31008) As the node hash scheme in verkle and merkle are totally different, the original default node hasher in pathdb is no longer suitable. Therefore, this pull request configures different node hasher respectively. * build: upgrade golangci-lint to v1.63.4 (#31019) This PR upgrades `golangci-lint` to v1.63.4 and fixes a warn message which is reported by v1.63.4: ```text WARN [config_reader] The configuration option `run.skip-dirs-use-default` is deprecated, please use `issues.exclude-dirs-use-default`. ``` Also fixes 2 warnings which are reported by v1.63.4: ```text core/txpool/blobpool/blobpool.go:1754:12: S1005: unnecessary assignment to the blank identifier (gosimple) for acct, _ := range p.index { ^ core/txpool/legacypool/legacypool.go:1989:19: S1005: unnecessary assignment to the blank identifier (gosimple) for localSender, _ := range pool.locals.accounts { ^ ``` * eth/tracers/logger: return revert reason (#31013) Fix the error comparison in tracer to prevent dropping revert reason data --------- Co-authored-by: Martin <mrscdevel@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * cmd/devp2p/internal/ethtest: using slices.SortFunc to simplify the code (#31012) Co-authored-by: Felix Lange <fjl@twurst.com> * core/txpool/legacypool: fix flaky test TestAllowedTxSize (#30975) - it was failing because the maximum data length (previously `dataSize`) was set to `txMaxSize - 213` but should had been `txMaxSize - 103` and the last call `dataSize+1+uint64(rand.Intn(10*txMaxSize)))` would sometimes fail depending on rand.Intn. - Maximal transaction data size comment (invalid) replaced by code logic to find the maximum tx length without its data length - comments and variable naming improved for clarity - 3rd pool add test replaced to add just 1 above the maximum length, which is important to ensure the logic is correct * core: remove unused function parameters (#31001) * cmd, core, miner: rework genesis setup (#30907) This pull request refactors the genesis setup function, the major changes are highlighted here: **(a) Triedb is opened in verkle mode if `EnableVerkleAtGenesis` is configured in chainConfig or the database has been initialized previously with `EnableVerkleAtGenesis` configured**. A new config field `EnableVerkleAtGenesis` has been added in the chainConfig. This field must be configured with True if Geth wants to initialize the genesis in Verkle mode. In the verkle devnet-7, the verkle transition is activated at genesis. Therefore, the verkle rules should be used since the genesis. In production networks (mainnet and public testnets), verkle activation always occurs after the genesis block. Therefore, this flag is only made for devnet and should be deprecated later. Besides, verkle transition at non-genesis block hasn't been implemented yet, it should be done in the following PRs. **(b) The genesis initialization condition has been simplified** There is a special mode supported by the Geth is that: Geth can be initialized with an existing chain segment, which can fasten the node sync process by retaining the chain freezer folder. Originally, if the triedb is regarded as uninitialized and the genesis block can be found in the chain freezer, the genesis block along with genesis state will be committed. This condition has been simplified to checking the presence of chain config in key-value store. The existence of chain config can represent the genesis has been committed. * all: fix some typos in comments and names (#31023) * core/types: change SetCodeTx.ChainID to uint256 (#30982) We still need to decide how to handle non-specfic `chainId` in the JSON encoding of authorizations. With `chainId` being a uint64, the previous implementation just used value zero. However, it might actually be more correct to use the value `null` for this case. * eth/gasprice: ensure cache purging goroutine terminates with subscription (#31025) * beacon/engine: check for empty requests (#31010) According to https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md#engine_newpayloadv4: > Elements of the list MUST be ordered by request_type in ascending order. Elements with empty request_data MUST be excluded from the list. --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * core: use sync.Once for SenderCacher initialization (#31029) This changes the SenderCacher so its goroutines will only be started on first use. Avoids starting them when package core is just imported but core.BlockChain isn't used. * core/txpool/legacypool: ensure pending nonces are reset by SubPool.Clear (#31020) closes https://github.com/ethereum/go-ethereum/issues/30842 * core/tracing: document `OnCodeChange` now being called from SelfDestruct (#31007) Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> * all: implement state history v2 (#30107) This pull request delivers the new version of the state history, where the raw storage key is used instead of the hash. Before the cancun fork, it's supported by protocol to destruct a specific account and therefore, all the storage slot owned by it should be wiped in the same transition. Technically, storage wiping should be performed through storage iteration, and only the storage key hash will be available for traversal if the state snapshot is not available. Therefore, the storage key hash is chosen as the identifier in the old version state history. Fortunately, account self-destruction has been deprecated by the protocol since the Cancun fork, and there are no empty accounts eligible for deletion under EIP-158. Therefore, we can conclude that no storage wiping should occur after the Cancun fork. In this case, it makes no sense to keep using hash. Besides, another big reason for making this change is the current format state history is unusable if verkle is activated. Verkle tree has a different key derivation scheme (merkle uses keccak256), the preimage of key hash must be provided in order to make verkle rollback functional. This pull request is a prerequisite for landing verkle. Additionally, the raw storage key is more human-friendly for those who want to manually check the history, even though Solidity already performs some hashing to derive the storage location. --- This pull request doesn't bump the database version, as I believe the database should still be compatible if users degrade from the new geth version to old one, the only side effect is the persistent new version state history will be unusable. --------- Co-authored-by: Zsolt Felfoldi <zsfelfoldi@gmail.com> * ethdb/memorydb: faster DeleteRange (#31038) This PR replaces the iterator based DeleteRange implementation of memorydb with a simpler and much faster loop that directly deletes keys in the order of iteration instead of unnecessarily collecting keys in memory and sorting them. --------- Co-authored-by: Martin HS <martin@swende.se> * cmd/abigen: require either `--abi` or `--combined-json` (#31045) This PR addresses issue #30768 , which highlights that running cmd/abigen/abigen --pkg my_package example.json (erroneously omitting the --abi flag) generates an empty binding, when it should fail explicitly. --------- Co-authored-by: jwasinger <j-wasinger@hotmail.com> * core/types: correct chainId check for pragueSigner (#31032) Use zero value check for the pragueSigner This aligns with cancunSigner and londonSigner as well. * build: upgrade -dlgo version to Go 1.23.5 (#31037) * core/types: initialize ChainID in SetCodeTx copy method (#31054) * core/txpool: terminate subpool reset goroutine if pool was closed (#31030) if the pool terminates before `resetDone` can be read, then the go-routine will hang. * cmd/evm: refactor handling output-files for `t8n` (#30854) As part of trying to make the inputs and outputs of the evm subcommands more streamlined and aligned, this PR modifies how `evm t8n` manages output-files. Previously, we do a kind of wonky thing where between each transaction, we invoke a `getTracer` closure. In that closure, we create a new output-file, a tracer, and then make the tracer stream output to the file. We also fiddle a bit to ensure that the file becomes properly closed. It is a kind of hacky solution we have in place. This PR changes it, so that from the execution-pipeline point of view, we have just a regular tracer. No fiddling with re-setting it or closing files. That particular tracer, however, is a bit special: it takes care of creating new files per transaction (in the tx-start-hook) and closing (on tx-end-hook). Also instantiating the right type of underlying tracer, which can be a json-logger or a custom tracer. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * eth/filters: ensure API timeoutLoop terminates with event system (#31056) Discovered from failing test introduced https://github.com/ethereum/go-ethereum/pull/31033 . We should ensure `timeoutLoop` terminates if the filter event system is terminated. * go.mod: remove toolchain line (#31057) We have our own system for downloading the toolchain, and really don't want Go's to get in the way of that. We may switch to Go's builtin toolchain support, but not now. * cmd/evm: restore --bench flag to evm statetest (#31055) Refactoring of the `evm` command moved where some commands were valid. One command, `--bench`, used to work in `evm statetest`. The pluming is still in place. This PR puts the `--bench` flag in the place the trace flags were moved, and adds tests to validate the bench flag operates in `run` and `statetest` --------- Co-authored-by: Felix Lange <fjl@twurst.com> * p2p: support configuring NAT in TOML file (#31041) This is an alternative for #27407 with a solution based on gencodec. With the PR, one can now configure like this: ``` # config.toml [Node.P2P] NAT = "extip:33.33.33.33" ``` ```shell $ geth --config config.toml ... INFO [01-17|16:37:31.436] Started P2P networking self=enode://2290...ab@33.33.33.33:30303 ``` * go.mod: gencodec stable v0.1.0 (#31062) * triedb/pathdb: fix state revert on v2 history (#31060) State history v2 has been shipped and will take effect after the Cancun fork. However, the state revert function does not differentiate between v1 and v2, instead blindly using the storage map key for state reversion. This mismatch between the keys of the live state set and the state history can trigger a panic: `non-existent storage slot for reverting`. This flaw has been fixed in this PR. * trie: reduce allocations in stacktrie (#30743) This PR uses various tweaks and tricks to make the stacktrie near alloc-free. ``` [user@work go-ethereum]$ benchstat stacktrie.1 stacktrie.7 goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/trie cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ stacktrie.1 │ stacktrie.7 │ │ sec/op │ sec/op vs base │ Insert100K-8 106.97m ± 8% 88.21m ± 34% -17.54% (p=0.000 n=10) │ stacktrie.1 │ stacktrie.7 │ │ B/op │ B/op vs base │ Insert100K-8 13199.608Ki ± 0% 3.424Ki ± 3% -99.97% (p=0.000 n=10) │ stacktrie.1 │ stacktrie.7 │ │ allocs/op │ allocs/op vs base │ Insert100K-8 553428.50 ± 0% 22.00 ± 5% -100.00% (p=0.000 n=10) ``` Also improves derivesha: ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/core/types cpu: 12th Gen Intel(R) Core(TM) i7-1270P │ derivesha.1 │ derivesha.2 │ │ sec/op │ sec/op vs base │ DeriveSha200/stack_trie-8 477.8µ ± 2% 430.0µ ± 12% -10.00% (p=0.000 n=10) │ derivesha.1 │ derivesha.2 │ │ B/op │ B/op vs base │ DeriveSha200/stack_trie-8 45.17Ki ± 0% 25.65Ki ± 0% -43.21% (p=0.000 n=10) │ derivesha.1 │ derivesha.2 │ │ allocs/op │ allocs/op vs base │ DeriveSha200/stack_trie-8 1259.0 ± 0% 232.0 ± 0% -81.57% (p=0.000 n=10) ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * eth/catalyst: fail on duplicate request types (#31071) Refer to: https://github.com/ethereum/execution-apis/pull/623 * accounts/usbwallet: fix ledger access for latest firmware and add Ledger Flex (#31004) The latest firmware for Ledger Nano S Plus now returns `0x5000` for it's product ID, which doesn't match any of the product IDs enumerated in `hub.go`. This PR removes the assumption about the interfaces exposed, and simply checks the upper byte for a match. Also adds support for the `0x0007` / `0x7000` product ID (Ledger Flex). * core/vm: implement EIP-2537 spec updates (#30978) Reference: - Remove MUL precompiles: https://github.com/ethereum/EIPs/pull/8945 - Pricing change for pairing operation: https://github.com/ethereum/EIPs/pull/9098 - Pricing change for add, mapping and mul operations: https://github.com/ethereum/EIPs/pull/9097 - Pricing change for MSM operations: https://github.com/ethereum/EIPs/pull/9116 --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * p2p/nat: add stun protocol (#31064) This implements a basic mechanism to query the node's external IP using a STUN server. There is a built-in list of public STUN servers for convenience. The new detection mechanism must be selected explicitly using `--nat=stun` and is not enabled by default in Geth. Fixes #30881 --------- Co-authored-by: Felix Lange <fjl@twurst.com> * fix README.md (#31076) Hi I fixed 2 minor spelling issues. --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * chore: fix various comments (#31082) * all: nuke total difficulty (#30744) The total difficulty is the sum of all block difficulties from genesis to a certain block. This value was used in PoW for deciding which chain is heavier, and thus which chain to select. Since PoS has a different fork selection algorithm, all blocks since the merge have a difficulty of 0, and all total difficulties are the same for the past 2 years. Whilst the TDs are mostly useless nowadays, there was never really a reason to mess around removing them since they are so tiny. This reasoning changes when we go down the path of pruned chain history. In order to reconstruct any TD, we **must** retrieve all the headers from chain head to genesis and then iterate all the difficulties to compute the TD. In a world where we completely prune past chain segments (bodies, receipts, headers), it is not possible to reconstruct the TD at all. In a world where we still keep chain headers and prune only the rest, reconstructing it possible as long as we process (or download) the chain forward from genesis, but trying to snap sync the head first and backfill later hits the same issue, the TD becomes impossible to calculate until genesis is backfilled. All in all, the TD is a messy out-of-state, out-of-consensus computed field that is overall useless nowadays, but code relying on it forces the client into certain modes of operation and prevents other modes or other optimizations. This PR completely nukes out the TD from the node. It doesn't compute it, it doesn't operate on it, it's as if it didn't even exist. Caveats: - Whenever we have APIs that return TD (devp2p handshake, tracer, etc.) we return a TD of 0. - For era files, we recompute the TD during export time (fairly quick) to retain the format content. - It is not possible to "verify" the merge point (i.e. with TD gone, TTD is useless). Since we're not verifying PoW any more, just blindly trust it, not verifying but blindly trusting the many year old merge point seems just the same trust model. - Our tests still need to be able to generate pre and post merge blocks, so they need a new way to split the merge without TTD. The PR introduces a settable ttdBlock field on the consensus object which is used by tests as the block where originally the TTD happened. This is not needed for live nodes, we never want to generate old blocks. - One merge transition consensus test was disabled. With a non-operational TD, testing how the client reacts to TTD is useless, it cannot react. Questions: - Should we also drop total terminal difficulty from the genesis json? It's a number we cannot react on any more, so maybe it would be cleaner to get rid of even more concepts. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * .github: add lint step (#31068) * core/{.,state,vm},miner,eth/tracers,tests: implement 7709 with a syscall flag (#31036) Same as #31015 but requires the contract to exist. Not compatible with any verkle testnet up to now. This adds a `isSytemCall` flag so that it is possible to detect when a system call is executed, so that the code execution and other locations are not added to the witness. --------- Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * build: bump test timeout (#31095) Travis often fails because the test times out. * .travis.yml: change arch for Docker build to arm64 (#31096) This is an attempt to work around a gcc issue in the Docker build. * Revert ".travis.yml: change arch for Docker build to arm64 (#31096)" This reverts commit7b96ec4dae. * build: retry PPA upload up to three times (#31099) * crypto: add IsOnCurve check (#31100) * build: provide a flag to disable publishing in dockerx build (#31098) This changes the `-upload` flag to just toggle the upload. The remote image name is now configured using the `-hub` flag. * version: begin v1.15.0 release cycle * all: add build tags for wasip1 (#31090) * core: implement eip-7623 floor data gas (#30946) This PR builds on #29040 and updates it to the new version of the spec. I filled the EEST tests and they pass. Link to spec: https://eips.ethereum.org/EIPS/eip-7623 --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: lightclient <lightclient@protonmail.com> * core/vm: EXTCODE* return delegation designator for 7702 (#31089) Implements https://github.com/ethereum/EIPs/pull/9248 * params: update system contract addresses for devnet-6 (#31102) Finalize Prague system contract addresses. Reference: * https://github.com/ethereum/EIPs/pull/9287 * https://github.com/ethereum/EIPs/pull/9288 * https://github.com/ethereum/EIPs/pull/9289 * eth/catalyst: fix validation of type 0 request (#31103) I caught this error on Hive. It was introduced by https://github.com/ethereum/go-ethereum/pull/31071 because after adding the equality check the request type 0 will be rejected. * core/vm: simplify tracer hook invocation in interpreter loop (#31074) Removes duplicate code in the interpreter loop. * tests/fuzzers/bls12381: fix error message in fuzzCrossG2Add (#31113) Fixes a typo in the error message within the `fuzzCrossG2Add` function. The panic message incorrectly references "G1 point addition mismatch" when it should be "G2 point addition mismatch," as the function deals with G2 points. This doesn't affect functionality but could cause confusion during debugging. I've updated the message to reflect the correct curve. * core/rawdb: introduce flush offset in freezer (#30392) This is a follow-up PR to #29792 to get rid of the data file sync. **This is a non-backward compatible change, which increments the database version from 8 to 9**. We introduce a flushOffset for each freezer table, which tracks the position of the most recently fsync’d item in the index file. When this offset moves forward, it indicates that all index entries below it, along with their corresponding data items, have been properly persisted to disk. The offset can also be moved backward when truncating from either the head or tail of the file. Previously, the data file required an explicit fsync after every mutation, which was highly inefficient. With the introduction of the flush offset, the synchronization strategy becomes more flexible, allowing the freezer to sync every 30 seconds instead. The data items above the flush offset are regarded volatile and callers must ensure they are recoverable after the unclean shutdown, or explicitly sync the freezer before any proceeding operations. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * core: copy genesis before modifying (#31097) This PR fixes a data race in SetupGenesisWithOverride. * params: start osaka fork (#31125) This PR defines the Osaka fork. An easy first step to start our work on the next hardfork (This is needed for EOF testing as well) --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * params,core: add max and target value to chain config (#31002) Implements [EIP-7840](https://github.com/ethereum/EIPs/pull/9129) and [EIP-7691](d96625a4dc/EIPS/eip-7691.md). --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Felix Lange <fjl@twurst.com> * core: assign default difficulty to zero for chain without ethash (#31067) I hit this case while trying something with the simulated backend. The EVM only enables instruction set forks after the merge when 'Random' is set. In the simulated backend, the random value will be set via the engine API for all blocks after genesis. But for the genesis block itself, the random value will not be assigned in the vm.BlockContext because the genesis has a non-zero difficulty. For my case, this meant that estimateGas did not work for the first transaction sent on the simulated chain, since the contract contained a PUSH0 instruction. This could also be fixed by explicitly configuring a zero difficulty in the simulated backend. However, I think that zero difficulty is a better default these days. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * core/txpool: remove locals-tracking from txpools (#30559) Replaces #29297, descendant from #27535 --------- This PR removes `locals` as a concept from transaction pools. Therefore, the pool now acts as very a good simulation/approximation of how our peers' pools behave. What this PR does instead, is implement a locals-tracker, which basically is a little thing which, from time to time, asks the pool "did you forget this transaction?". If it did, the tracker resubmits it. If the txpool _had_ forgotten it, chances are that the peers had also forgotten it. It will be propagated again. Doing this change means that we can simplify the pool internals, quite a lot. ### The semantics of `local` Historically, there has been two features, or usecases, that has been combined into the concept of `locals`. 1. "I want my local node to remember this transaction indefinitely, and resubmit to the network occasionally" 2. "I want this (valid) transaction included to be top-prio for my miner" This PR splits these features up, let's call it `1: local` and `2: prio`. The `prio` is not actually individual transaction, but rather a set of `address`es to prioritize. The attribute `local` means it will be tracked, and `prio` means it will be prioritized by miner. For `local`: anything transaction received via the RPC is marked as `local`, and tracked by the tracker. For `prio`: any transactions from this sender is included first, when building a block. The existing commandline-flag `--txpool.locals` sets the set of `prio` addresses. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/txpool/blobpool: fix incorrect arguments in test (#31127) Fixes the linter on master which was broken by https://github.com/ethereum/go-ethereum/pull/30559 * consensus/misc/eip4844: use head's target blobs, not parent (#31101) A clarification was made to EIP-7691 stating that at the fork boundary it is required to use the target blob count associated with the head block, rather than the parent as implemented here. See for more: https://github.com/ethereum/EIPs/pull/9249 * consensus/misc/eip4844: more changes for blob gas calculation (#31128) This PR changes the signature of `CalcExcessBlobGas` to take in just the header timestamp instead of the whole object. It also adds a sanity check for the parent->child block order to `VerifyEIP4844Header`. * core/tracing: state journal wrapper (#30441) Here we add some more changes for live tracing API v1.1: - Hook `OnSystemCallStartV2` was introduced with `VMContext` as parameter. - Hook `OnBlockHashRead` was introduced. - `GetCodeHash` was added to the state interface - The new `WrapWithJournal` construction helps with tracking EVM reverts in the tracer. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * all: update license comments and AUTHORS (#31133) * build: update to Go 1.23.6 (#31130) Co-authored-by: Felix Lange <fjl@twurst.com> * build: update EEST fixtures to prague devnet-6 (#31088) Co-authored-by: lightclient <lightclient@protonmail.com> * version: release go-ethereum v1.15.0 * version: begin v1.15.1 release cycle * cmd/devp2p/internal/ethtest: remove TD from status validation (#31137) After recent changes in Geth (removing TD):39638c81c5 (diff-d70a44d4b7a0e84fe9dcca25d368f626ae6c9bc0b8fe9690074ba92d298bcc0d)Non-Geth clients are failing many devp2p tests with an error: `peering failed: status exchange failed: wrong TD in status: have 1 want 0` Right now only Geth is passing it - all other clients are affected by this change. I think there should be no validation of TD when checking `Status` message in hive tests. Now Geth has 0 (and hive tests requires 0) and all other clients have actual TD. And on real networks there is no validation of TD when peering * params,core/forkid: enable prague on holesky and sepolia (#31139) Agreed to the following fork dates for Holesky and Sepolia on ACDC 150 Holesky slot: 3710976 (Mon, Feb 24 at 21:55:12 UTC) Sepolia slot: 7118848 (Wed, Mar 5 at 07:29:36 UTC) * consensus/beacon: remove TestingTTDBlock (#31153) This removes the method `TestingTTDBlock` introduced by #30744. It was added to make the beacon consensus engine aware of the merge block in tests without relying on the total difficulty. However, tracking the merge block this way is very annoying. We usually configure forks in the `ChainConfig`, but the method is on the consensus engine, which isn't always created in the same place. By sidestepping the `ChainConfig` we don't get the usual fork-order checking, so it's possible to enable the merge before the London fork, for example. This in turn can lead to very hard-to-debug outputs and validation errors. So here I'm changing the consensus engine to check the `MergeNetsplitBlock` instead. Alternatively, we assume a network is merged if it has a `TerminalTotalDifficulty` of zero, which is a very common configuration in tests. * p2p/discover: remove unused parameter in revalidationList.get (#31155) * p2p/discover: make discv5 response timeout configurable (#31119) * core/txpool/legacypool: add support for SetCode transactions (#31073) The new SetCode transaction type introduces some additional complexity when handling the transaction pool. This complexity stems from two new account behaviors: 1. The balance and nonce of an account can change during regular transaction execution *when they have a deployed delegation*. 2. The nonce and code of an account can change without any EVM execution at all. This is the "set code" mechanism introduced by EIP-7702. The first issue has already been considered extensively during the design of ERC-4337, and we're relatively confident in the solution of simply limiting the number of in-flight pending transactions an account can have to one. This puts a reasonable bound on transaction cancellation. Normally to cancel, you would need to spend 21,000 gas. Now it's possible to cancel for around the cost of warming the account and sending value (`2,600+9,000=11,600`). So 50% cheaper. The second issue is more novel and needs further consideration. Since authorizations are not bound to a specific transaction, we cannot drop transactions with conflicting authorizations. Otherwise, it might be possible to cherry-pick authorizations from txs and front run them with different txs at much lower fee amounts, effectively DoSing the authority. Fortunately, conflicting authorizations do not affect the underlying validity of the transaction so we can just accept both. --------- Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Felix Lange <fjl@twurst.com> * internal/ethapi: fix panic in debug methods (#31157) Fixes an error when the block is not found in debug methods. * trie: copy preimage store pointer in StateTrie.Copy (#31158) This fixes an error where executing `evm run --dump ...` omits preimages from the dump (because the statedb used for execution is a copy of another instance). * go.mod: update blst to v0.3.14 (#31165) closes https://github.com/ethereum/go-ethereum/issues/31072 BLST released their newest version which includes a fix for go v.1.24: https://github.com/supranational/blst/releases/tag/v0.3.14 I went through all commits between 0.3.14 and 0.3.13 for a sanity check * core: sanity-check fork configuration in genesis (#31171) This is to prevent a crash on startup with a custom genesis configuration. With this change in place, upgrading a chain created by geth v1.14.x and below will now print an error instead of crashing: Fatal: Failed to register the Ethereum service: invalid chain configuration: missing entry for fork "cancun" in blobSchedule Arguably this is not great, and it should just auto-upgrade the config. We'll address this in a follow-up PR for geth v1.15.2 * core/rawdb: skip setting flushOffset in read-only mode (#31173) This PR addresses a flaw in the freezer table upgrade path. In v1.15.0, freezer table v2 was introduced, including an additional field (`flushOffset`) maintained in the metadata file. To ensure backward compatibility, an upgrade path was implemented for legacy freezer tables by setting `flushOffset` to the size of the index file. However, if the freezer table is opened in read-only mode, this file write operation is rejected, causing Geth to shut down entirely. Given that invalid items in the freezer index file can be detected and truncated, all items in freezer v0 index files are guaranteed to be complete. Therefore, when operating in read-only mode, it is safe to use the freezer data without performing an upgrade. * version: release go-ethereum v1.15.1 stable * version: begin v1.15.2 release cycle * core/types: create block's bloom by merging receipts' bloom (#31129) Currently, when calculating block's bloom, we loop through all the receipt logs to calculate the hash value. However, normally, after going through applyTransaction, the receipt's bloom is already calculated based on the receipt log, so the block's bloom can be calculated by just ORing these receipt's blooms. ``` goos: darwin goarch: arm64 pkg: github.com/ethereum/go-ethereum/core/types cpu: Apple M1 Pro BenchmarkCreateBloom BenchmarkCreateBloom/small BenchmarkCreateBloom/small-10 810922 1481 ns/op 104 B/op 5 allocs/op BenchmarkCreateBloom/large BenchmarkCreateBloom/large-10 8173 143764 ns/op 9614 B/op 401 allocs/op BenchmarkCreateBloom/small-mergebloom BenchmarkCreateBloom/small-mergebloom-10 5178918 232.0 ns/op 0 B/op 0 allocs/op BenchmarkCreateBloom/large-mergebloom BenchmarkCreateBloom/large-mergebloom-10 54110 22207 ns/op 0 B/op 0 allocs/op ``` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Zsolt Felfoldi <zsfelfoldi@gmail.com> * consensus/beacon: fix isPostMerge for mainnet (#31191) This fixes a regression introduced in #31153 where we didn't consider mainnet to be in PoS, causing #31190. The problem is, `params.MainnetChainConfig` does not have a defined `MergeNetsplitBlock`, so it isn't considered to be in PoS in `CalcDifficulty`. * p2p: fix marshaling of NAT in TOML (#31192) This fixes an issue where a nat.Interface unmarshaled from the TOML config file could not be re-marshaled to TOML correctly. Fixes #31183 * eth/protocols/eth: add discovery iterator to protocol (#31185) We somehow forgot to add this in #30302, so discv5 and DNS have actually been disabled since then. Fixes #31168 * version: release go-ethereum v1.15.2 stable * version: begin v1.15.3 release cycle * trie: do not expect ordering in stacktrie during fuzzing (#31170) This PR removes the assumption of the stacktrie and trie to have the same ordering. This was hit by the fuzzers on oss-fuzz --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * utils: clarify description for history.state flag (#31164) * ethclient: add comment describing block number tags (#30984) Adds a comment on how to use rpc.*BlockNumber and the explanation of the block number tags --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/vm: clean up EVM environmental structure (#31061) This PR does a few things including: - Remove `ContractRef` interface - Remove `vm.AccountRef` which implements `ContractRef` interface - Maintain the `jumpDests` struct in EVM for sharing between call frames - Simplify the delegateCall context initialization * params: add osaka blob schedule (#31174) Prevents crashes when running execution spec tests for osaka * eth/catalyst: support earlier forks in SimulatedBeacon (#31084) Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * build: upgrade -dlgo version to Go 1.24.0 (#31159) Co-authored-by: Felix Lange <fjl@twurst.com> * core/asm: delete assembler/disassembler (#31211) I maintain an improved version of the go-ethereum assembler at https://github.com/fjl/geas. We don't really use core/asm in our tests, and it has some bugs that prevent it from being useful, so I'm removing the package. * .github: downgrade go for lint step (#31217) * core/txpool/legacypool: add setCodeTx reorg test (#31206) This PR adds a test that makes sure that a node can send multiple transactions again once a authorization is removed * internal/ethapi: handle prague system calls in eth_simulate (#31176) eth_simulate was not processing prague system calls for history contract and EL requests resulting in inaccurate stateRoot and requestsRoot fields in the block. * eth/tracers: refactor block context in test runner (#29450) This commit contains a minor refactoring of the block context used within the test runners. --------- Signed-off-by: jsvisa <delweng@gmail.com> * oss-fuzz: remove deprecated targets (#31224) Fixes https://github.com/ethereum/go-ethereum/issues/31223 (sorry, I thought the fork fork would be created on my repo, not upstream, when I used the GH editor) * p2p/nat: remove test with default servers (#31225) The test occasionally fails when network connectivity is bad or if it hits the wrong server. We usually don't add tests with external network dependency so I'm removing them. Fixes #31220 * core/types: remove unneeded todo marker (#31179) * signer/core: fix encoding of `bytes` nested within array (#31049) Fixes an incorrect encoding of recursive bytes types. closes https://github.com/ethereum/go-ethereum/issues/30979 * internal/ethapi: fix prev hashes in eth_simulate (#31122) Shout-out to @Gabriel-Trintinalia for discovering this issue. The gist of it as follows: When processing a block, we should provide the parent block as well as the last 256 block hashes. Some of these parents data (specifically the hash) was incorrect because even though during the processing of the parent block we have updated the header, that header was not updating the TransactionsRoot and ReceiptsRoot fields (types.NewBlock makes a new copy of the header and changes it only on that instance). --------- Co-authored-by: lightclient <lightclient@protonmail.com> * cmd/clef: improve documentation in readme (#31218) Fixed broken or outdated links and improved documentation formatting to ensure consistency and correct references. --------- Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> * build: replace `tenv` linter with `usetesting` (#31172) * eth: report error from setupDiscovery at startup (#31233) I ran into this while trying to debug a discv5 thing. I tried to disable DNS discovery using `--discovery.dns=false`, which doesn't work. Annoyingly, geth started anyway and discarded the error silently. I eventually found my mistake, but it took way longer than it should have. Also including a small change to the error message for invalid DNS URLs here. The user actually needs to see the URL to make sense of the error. * go.mod: update cloudflare-go (#31240) Updates cloudflare-go from v0.79.0 to v0.114.0 which also gets rid of a dependency to `github.com/hashicorp/go-retryablehttp` which had a security flaw. Diff: https://github.com/cloudflare/cloudflare-go/compare/v0.79.0...v0.114.0 I did a quick sanity check on the diff on all methods that we use and went through the release notes, there was nothing related to how we use it afaict * crypto: add comment to FromECDSAPub (#31241) closes https://github.com/ethereum/go-ethereum/issues/26240 * core/txpool: move setcode tx validation into legacyPool (#31209) In this PR, several improvements have been made: Authorization-related validations have been moved to legacyPool. Previously, these checks were part of the standard validation procedure, which applies common validations across different pools. Since these checks are specific to SetCode transactions, relocating them to legacyPool is a more reasonable choice. Additionally, authorization conflict checks are now performed regardless of whether the transaction is a replacement or not. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * params: add deposit contract addresses (#31247) We forgot to add the deposit contract address for holesky, causing deposits to not be flagged correctly --------- Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * ethclient/simulated: add goroutine leak test (#31033) Adds a basic sanity test case to catch any go-routines leaked from instantiation/closing of a simulated backend. * eth/protocols/eth: fix loading "eth" ENR key in dial filter (#31251) This fixes an issue where dial candidates from discv5 would be ignored because the "eth" ENR entry was not loaded correctly. * version: release go-ethereum v1.15.3 stable * version: begin v1.15.4 release cycle * build: filter out .git folder for go generate check (#31265) Fixes lint issue >>> /home/appveyor/.gvm/gos/go1.24.0/bin/go generate ./... ci.go:404: File changed: .git/index ci.go:407: One or more generated files were updated by running 'go generate ./...' exit status 1 * eth/gasprice: fix eth_feeHistory blobGasRatio (#31246) This change divides BlobGasUsed by MaxBlobGasPerBlock instead of MaxBlobsPerBlock. Dividing by MaxBlobsPerBlock meant the blobGasUsedRatio was an incorrect large number. This bug was introduced by a typo [here](e6f3ce7b16 (diff-3357b2399699d7cf954c543cbfb02ff442eb24491e55f5e813e3cc85829b3e8dR110)) Fixes https://github.com/ethereum/go-ethereum/issues/31245 * cmd/workload: RPC workload tests for filters and history (#31189) Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * eth/gasprice: sanity check ratio values (#31270) Follow on to #31246. Adds a sanity check in the test to make sure the ratio value never goes over 1. Would have avoided the issue in #31245. * core/txpool: fix error logs flood caused by removeAuthorities (#31249) when remove an non-SetCodeTxType transaction, error logs flood ``` t=2025-02-25T03:11:06+0000 lvl=error msg="Authority with untracked tx" addr=0xD5bf9221fCB1C31Cd1EE477a60c148d40dD63DC1 hash=0x626fdf205a5b1619deb2f9e51fed567353f80acbd522265b455daa0821c571d9 ``` in this PR, only try to removeAuthorities for txs with SetCodeTxType in addition, the performance of removeAuthorities improved a lot, because no need range all `t.auths` now. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * build: update PPA Go bootstrap version to 1.23 (#31282) This is for fixing the PPA build, which has been failing since the update to Go 1.24. In Go 1.24, the required Go version for bootstrapping was updated to 1.22. In general, they are following through with always depending on the Go version two releases ago for bootstrapping. Since we still support Ubuntu Xenial (16.04) until its EOL date of 04/2026, and Xenial only has golang 1.10 as a package, we now need to build Go a total of four times to get the most recent version. I'm adding a step for Go 1.23 here. This should last us until Go 1.25, which should be out around 04/2026, and we can hopefully drop the first bootstrapping step at that time. * build: simplify go mod tidy check (#31266) This changes the go mod tidy check to use the go mod tidy -diff command, removing the custom diffing for go.mod. The check for go.mod/go.sum is now performed in the check_generate action. Also included is a change where check_generate and check_baddeps will now run on the GitHub Actions lint step. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * all: drop x/exp direct dependency (#30558) This is a not-particularly-important "cleanliness" PR. It removes the last remnants of the `x/exp` package, where we used the `maps.Keys` function. The original returned the keys in a slice, but when it became 'native' the signature changed to return an iterator, so the new idiom is `slices.Collect(maps.Keys(theMap))`, unless of course the raw iterator can be used instead. In some cases, where we previously collect into slice and then sort, we can now instead do `slices.SortXX` on the iterator instead, making the code a bit more concise. This PR might be _slighly_ less optimal, because the original `x/exp` implementation allocated the slice at the correct size off the bat, which I suppose the new code won't. Putting it up for discussion. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build/deb: add step for new Go bootstrap to debian rules (#31283) Next attempt at fixing the build on launchpad.net * core/tracing: stringer for gas and nonce change reasons (#31234) * eth: remove EventMux accessors (#30017) Hi, it seems these methods in the `backend.go` and `api_backend.go` files are not used that expose the eventMux, but that is not needed. * eth: do not add failed tx to localTxTracker (#31202) In transaction-sending APIs such as `eth_sendRawTransaction`, a submitted transaction failing the configured txpool validation rules (i.e. fee too low) would cause an error to be returned, even though the transaction was successfully added into the locals tracker. Once added there, the transaction may even be included into the chain at a later time, when fee market conditions change. This change improves on this by performing the validation in the locals tracker, basically skipping some of the validation rules for local transactions. We still try to add the tx to the main pool immediately, but an error will only be returned for transactions which are fundamentally invalid. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * eth: check blob transaction validity on the peer goroutine when received (#31219) This ensures that if we receive a blob transaction announcement where we cannot link the tx to the sidecar commitments, we will drop the sending peer. This check is added in the protocol handler for the PooledTransactions message. Tests for this have also been added in the cross-client "eth" protocol test suite. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * ethclient: add BlobBaseFee method (#31290) * version: release go-ethereum v1.15.4 stable * version: begin v1.15.5 release cycle * eth/tracers: fix omitempty for memory and storage (#31289) This fixes a regression in the opcode tracer API where we would log empty memory and storage fields. * build: upgrade to Go 1.24.1 and golangci-lint 1.64.4 (#31313) - upgrade -dlgo version to Go 1.24.1 - upgrade golangci-lint version to 1.64.6 * core: match on deposit contract log topic (#31317) This resolves a situation on the Sepolia testnet, which has a different deposit contract. The contract on that network emits two kinds of logs, instead of only deposit events like the deposit contract on mainnet. So we need to skip events with mismatched topics. * version: release v1.15.5 stable * fix: fix compiler errors * feat: merge 1.15.5 * fix: fix lint errors * feat: fix some diffs * feat: update types * feat: update comments * feat: fix some diffs * feat: fix some diffs * test: update tests * feat: update some jsons * test: update core/state_transition.go * feat: fix a test issue * chore: update ci * chore: update ci * feat: update config.go * feat: update core/state_processor.go * feat: update core/state_processor.go * feat: more changes * feat: update * feat: update state * feat: update ci --------- Signed-off-by: wangjingcun <wangjingcun@aliyun.com> Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: Madhur Shrimal <madhur.shrimal@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Naveen <116692862+naveen-imtb@users.noreply.github.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: Karol Chojnowski <karolchojnowski95@gmail.com> Co-authored-by: zhiqiangxu <652732310@qq.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: tianyeyouyou <tianyeyouyou@gmail.com> Co-authored-by: witty <131909329+0xwitty@users.noreply.github.com> Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com> Co-authored-by: bitcoin-lightning <153181187+AtomicInnovation321@users.noreply.github.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Håvard Anda Estensen <haavard.ae@gmail.com> Co-authored-by: Hyunsoo Shin (Lake) <hyunsooda@kaist.ac.kr> Co-authored-by: wangjingcun <wangjingcun@aliyun.com> Co-authored-by: j2gg0s <j2gg0s@gmail.com> Co-authored-by: Daniel Liu <139250065@qq.com> Co-authored-by: Jordan Krage <jmank88@gmail.com> Co-authored-by: Arran Schlosberg <519948+ARR4N@users.noreply.github.com> Co-authored-by: Nebojsa Urosevic <nebojsa94@users.noreply.github.com> Co-authored-by: Ng Wei Han <47109095+weiihann@users.noreply.github.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> Co-authored-by: steven <wangpeculiar@gmail.com> Co-authored-by: Zheyuan He <ecjgvmhc@gmail.com> Co-authored-by: Hteev Oli <gethorz@proton.me> Co-authored-by: Darren Kelly <107671032+darrenvechain@users.noreply.github.com> Co-authored-by: gitglorythegreat <t4juu3@proton.me> Co-authored-by: lorenzo <31852651+lorenzo-dev1@users.noreply.github.com> Co-authored-by: Antony Denyer <email@antonydenyer.co.uk> Co-authored-by: Lucas <lucaslg360@gmail.com> Co-authored-by: Mario Vega <marioevz@gmail.com> Co-authored-by: maskpp <maskpp266@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: かげ <47621124+ronething-bot@users.noreply.github.com> Co-authored-by: georgehao <haohongfan@gmail.com> Co-authored-by: Savely <136869149+savvar9991@users.noreply.github.com> Co-authored-by: Ceyhun Onur <ceyhun.onur@avalabs.org> Co-authored-by: Daniel Liu <liudaniel@qq.com> Co-authored-by: Martin Redmond <21436+reds@users.noreply.github.com> Co-authored-by: Martin <mrscdevel@gmail.com> Co-authored-by: dashangcun <907225865@qq.com> Co-authored-by: Quentin McGaw <quentin.mcgaw@gmail.com> Co-authored-by: Paul Lange <palango@users.noreply.github.com> Co-authored-by: Matthieu Vachon <matt@streamingfast.io> Co-authored-by: Cedrick <Cedrickentrep@gmail.com> Co-authored-by: Shude Li <islishude@gmail.com> Co-authored-by: levisyin <lilassherl@gmail.com> Co-authored-by: Danno Ferrin <danno@numisight.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Michael de Hoog <michael.dehoog@coinbase.com> Co-authored-by: zhen peng <505380967@qq.com> Co-authored-by: Christina <156356273+cratiu222@users.noreply.github.com> Co-authored-by: Ryan Tinianov <tinianov@live.com> Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: kazak <alright-epsilon8h@icloud.com> Co-authored-by: ericxtheodore <ericxtheodore@outlook.com> Co-authored-by: Marcin Sobczak <77129288+marcindsobczak@users.noreply.github.com> Co-authored-by: Harry Ngo <17699212+huyngopt1994@users.noreply.github.com> Co-authored-by: Chen Kai <281165273grape@gmail.com> Co-authored-by: minh-bq <minh.bui@skymavis.com> Co-authored-by: piersy <pierspowlesland@gmail.com> Co-authored-by: EdisonSR <61781882@qq.com> Co-authored-by: nethoxa <135072738+nethoxa@users.noreply.github.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: rrhlrmrr <39875249+rrhlrmrr@users.noreply.github.com> Co-authored-by: Maximilian Hubert <64627729+gap-editor@users.noreply.github.com> Co-authored-by: James <jamesstanleystewart@gmail.com> Co-authored-by: buddho <galaxystroller@gmail.com> Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org> Co-authored-by: Kuwon Sebastian Na <laggu91@gmail.com>
1766 lines
67 KiB
Go
1766 lines
67 KiB
Go
// Copyright 2022 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 blobpool implements the EIP-4844 blob transaction pool.
|
|
package blobpool
|
|
|
|
import (
|
|
"container/heap"
|
|
"errors"
|
|
"fmt"
|
|
"math"
|
|
"math/big"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/consensus/misc/eip1559"
|
|
"github.com/ethereum/go-ethereum/consensus/misc/eip4844"
|
|
"github.com/ethereum/go-ethereum/core"
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
"github.com/ethereum/go-ethereum/core/txpool"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/crypto/kzg4844"
|
|
"github.com/ethereum/go-ethereum/event"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/metrics"
|
|
"github.com/ethereum/go-ethereum/params"
|
|
"github.com/ethereum/go-ethereum/rlp"
|
|
"github.com/holiman/billy"
|
|
"github.com/holiman/uint256"
|
|
)
|
|
|
|
const (
|
|
// blobSize is the protocol constrained byte size of a single blob in a
|
|
// transaction. There can be multiple of these embedded into a single tx.
|
|
blobSize = params.BlobTxFieldElementsPerBlob * params.BlobTxBytesPerFieldElement
|
|
|
|
// txAvgSize is an approximate byte size of a transaction metadata to avoid
|
|
// tiny overflows causing all txs to move a shelf higher, wasting disk space.
|
|
txAvgSize = 4 * 1024
|
|
|
|
// txMaxSize is the maximum size a single transaction can have, outside
|
|
// the included blobs. Since blob transactions are pulled instead of pushed,
|
|
// and only a small metadata is kept in ram, the rest is on disk, there is
|
|
// no critical limit that should be enforced. Still, capping it to some sane
|
|
// limit can never hurt.
|
|
txMaxSize = 1024 * 1024
|
|
|
|
// maxTxsPerAccount is the maximum number of blob transactions admitted from
|
|
// a single account. The limit is enforced to minimize the DoS potential of
|
|
// a private tx cancelling publicly propagated blobs.
|
|
//
|
|
// Note, transactions resurrected by a reorg are also subject to this limit,
|
|
// so pushing it down too aggressively might make resurrections non-functional.
|
|
maxTxsPerAccount = 16
|
|
|
|
// pendingTransactionStore is the subfolder containing the currently queued
|
|
// blob transactions.
|
|
pendingTransactionStore = "queue"
|
|
|
|
// limboedTransactionStore is the subfolder containing the currently included
|
|
// but not yet finalized transaction blobs.
|
|
limboedTransactionStore = "limbo"
|
|
)
|
|
|
|
// blobTxMeta is the minimal subset of types.BlobTx necessary to validate and
|
|
// schedule the blob transactions into the following blocks. Only ever add the
|
|
// bare minimum needed fields to keep the size down (and thus number of entries
|
|
// larger with the same memory consumption).
|
|
type blobTxMeta struct {
|
|
hash common.Hash // Transaction hash to maintain the lookup table
|
|
vhashes []common.Hash // Blob versioned hashes to maintain the lookup table
|
|
|
|
id uint64 // Storage ID in the pool's persistent store
|
|
size uint32 // Byte size in the pool's persistent store
|
|
|
|
nonce uint64 // Needed to prioritize inclusion order within an account
|
|
costCap *uint256.Int // Needed to validate cumulative balance sufficiency
|
|
execTipCap *uint256.Int // Needed to prioritize inclusion order across accounts and validate replacement price bump
|
|
execFeeCap *uint256.Int // Needed to validate replacement price bump
|
|
blobFeeCap *uint256.Int // Needed to validate replacement price bump
|
|
execGas uint64 // Needed to check inclusion validity before reading the blob
|
|
blobGas uint64 // Needed to check inclusion validity before reading the blob
|
|
|
|
basefeeJumps float64 // Absolute number of 1559 fee adjustments needed to reach the tx's fee cap
|
|
blobfeeJumps float64 // Absolute number of 4844 fee adjustments needed to reach the tx's blob fee cap
|
|
|
|
evictionExecTip *uint256.Int // Worst gas tip across all previous nonces
|
|
evictionExecFeeJumps float64 // Worst base fee (converted to fee jumps) across all previous nonces
|
|
evictionBlobFeeJumps float64 // Worse blob fee (converted to fee jumps) across all previous nonces
|
|
}
|
|
|
|
// newBlobTxMeta retrieves the indexed metadata fields from a blob transaction
|
|
// and assembles a helper struct to track in memory.
|
|
func newBlobTxMeta(id uint64, size uint32, tx *types.Transaction) *blobTxMeta {
|
|
meta := &blobTxMeta{
|
|
hash: tx.Hash(),
|
|
vhashes: tx.BlobHashes(),
|
|
id: id,
|
|
size: size,
|
|
nonce: tx.Nonce(),
|
|
costCap: uint256.MustFromBig(tx.Cost()),
|
|
execTipCap: uint256.MustFromBig(tx.GasTipCap()),
|
|
execFeeCap: uint256.MustFromBig(tx.GasFeeCap()),
|
|
blobFeeCap: uint256.MustFromBig(tx.BlobGasFeeCap()),
|
|
execGas: tx.Gas(),
|
|
blobGas: tx.BlobGas(),
|
|
}
|
|
meta.basefeeJumps = dynamicFeeJumps(meta.execFeeCap)
|
|
meta.blobfeeJumps = dynamicFeeJumps(meta.blobFeeCap)
|
|
|
|
return meta
|
|
}
|
|
|
|
// BlobPool is the transaction pool dedicated to EIP-4844 blob transactions.
|
|
//
|
|
// Blob transactions are special snowflakes that are designed for a very specific
|
|
// purpose (rollups) and are expected to adhere to that specific use case. These
|
|
// behavioural expectations allow us to design a transaction pool that is more robust
|
|
// (i.e. resending issues) and more resilient to DoS attacks (e.g. replace-flush
|
|
// attacks) than the generic tx pool. These improvements will also mean, however,
|
|
// that we enforce a significantly more aggressive strategy on entering and exiting
|
|
// the pool:
|
|
//
|
|
// - Blob transactions are large. With the initial design aiming for 128KB blobs,
|
|
// we must ensure that these only traverse the network the absolute minimum
|
|
// number of times. Broadcasting to sqrt(peers) is out of the question, rather
|
|
// these should only ever be announced and the remote side should request it if
|
|
// it wants to.
|
|
//
|
|
// - Block blob-space is limited. With blocks being capped to a few blob txs, we
|
|
// can make use of the very low expected churn rate within the pool. Notably,
|
|
// we should be able to use a persistent disk backend for the pool, solving
|
|
// the tx resend issue that plagues the generic tx pool, as long as there's no
|
|
// artificial churn (i.e. pool wars).
|
|
//
|
|
// - Purpose of blobs are layer-2s. Layer-2s are meant to use blob transactions to
|
|
// commit to their own current state, which is independent of Ethereum mainnet
|
|
// (state, txs). This means that there's no reason for blob tx cancellation or
|
|
// replacement, apart from a potential basefee / miner tip adjustment.
|
|
//
|
|
// - Replacements are expensive. Given their size, propagating a replacement
|
|
// blob transaction to an existing one should be aggressively discouraged.
|
|
// Whilst generic transactions can start at 1 Wei gas cost and require a 10%
|
|
// fee bump to replace, we suggest requiring a higher min cost (e.g. 1 gwei)
|
|
// and a more aggressive bump (100%).
|
|
//
|
|
// - Cancellation is prohibitive. Evicting an already propagated blob tx is a huge
|
|
// DoS vector. As such, a) replacement (higher-fee) blob txs mustn't invalidate
|
|
// already propagated (future) blob txs (cumulative fee); b) nonce-gapped blob
|
|
// txs are disallowed; c) the presence of blob transactions exclude non-blob
|
|
// transactions.
|
|
//
|
|
// - Malicious cancellations are possible. Although the pool might prevent txs
|
|
// that cancel blobs, blocks might contain such transaction (malicious miner
|
|
// or flashbotter). The pool should cap the total number of blob transactions
|
|
// per account as to prevent propagating too much data before cancelling it
|
|
// via a normal transaction. It should nonetheless be high enough to support
|
|
// resurrecting reorged transactions. Perhaps 4-16.
|
|
//
|
|
// - Local txs are meaningless. Mining pools historically used local transactions
|
|
// for payouts or for backdoor deals. With 1559 in place, the basefee usually
|
|
// dominates the final price, so 0 or non-0 tip doesn't change much. Blob txs
|
|
// retain the 1559 2D gas pricing (and introduce on top a dynamic blob gas fee),
|
|
// so locality is moot. With a disk backed blob pool avoiding the resend issue,
|
|
// there's also no need to save own transactions for later.
|
|
//
|
|
// - No-blob blob-txs are bad. Theoretically there's no strong reason to disallow
|
|
// blob txs containing 0 blobs. In practice, admitting such txs into the pool
|
|
// breaks the low-churn invariant as blob constraints don't apply anymore. Even
|
|
// though we could accept blocks containing such txs, a reorg would require moving
|
|
// them back into the blob pool, which can break invariants.
|
|
//
|
|
// - Dropping blobs needs delay. When normal transactions are included, they
|
|
// are immediately evicted from the pool since they are contained in the
|
|
// including block. Blobs however are not included in the execution chain,
|
|
// so a mini reorg cannot re-pool "lost" blob transactions. To support reorgs,
|
|
// blobs are retained on disk until they are finalised.
|
|
//
|
|
// - Blobs can arrive via flashbots. Blocks might contain blob transactions we
|
|
// have never seen on the network. Since we cannot recover them from blocks
|
|
// either, the engine_newPayload needs to give them to us, and we cache them
|
|
// until finality to support reorgs without tx losses.
|
|
//
|
|
// Whilst some constraints above might sound overly aggressive, the general idea is
|
|
// that the blob pool should work robustly for its intended use case and whilst
|
|
// anyone is free to use blob transactions for arbitrary non-rollup use cases,
|
|
// they should not be allowed to run amok the network.
|
|
//
|
|
// Implementation wise there are a few interesting design choices:
|
|
//
|
|
// - Adding a transaction to the pool blocks until persisted to disk. This is
|
|
// viable because TPS is low (2-4 blobs per block initially, maybe 8-16 at
|
|
// peak), so natural churn is a couple MB per block. Replacements doing O(n)
|
|
// updates are forbidden and transaction propagation is pull based (i.e. no
|
|
// pileup of pending data).
|
|
//
|
|
// - When transactions are chosen for inclusion, the primary criteria is the
|
|
// signer tip (and having a basefee/data fee high enough of course). However,
|
|
// same-tip transactions will be split by their basefee/datafee, preferring
|
|
// those that are closer to the current network limits. The idea being that
|
|
// very relaxed ones can be included even if the fees go up, when the closer
|
|
// ones could already be invalid.
|
|
//
|
|
// - Because the maximum number of blobs allowed in a block can change per
|
|
// fork, the pool is designed to handle the maximum number of blobs allowed
|
|
// in the chain's latest defined fork -- even if it isn't active. This
|
|
// avoids needing to upgrade the database around the fork boundary.
|
|
//
|
|
// When the pool eventually reaches saturation, some old transactions - that may
|
|
// never execute - will need to be evicted in favor of newer ones. The eviction
|
|
// strategy is quite complex:
|
|
//
|
|
// - Exceeding capacity evicts the highest-nonce of the account with the lowest
|
|
// paying blob transaction anywhere in the pooled nonce-sequence, as that tx
|
|
// would be executed the furthest in the future and is thus blocking anything
|
|
// after it. The smallest is deliberately not evicted to avoid a nonce-gap.
|
|
//
|
|
// - Analogously, if the pool is full, the consideration price of a new tx for
|
|
// evicting an old one is the smallest price in the entire nonce-sequence of
|
|
// the account. This avoids malicious users DoSing the pool with seemingly
|
|
// high paying transactions hidden behind a low-paying blocked one.
|
|
//
|
|
// - Since blob transactions have 3 price parameters: execution tip, execution
|
|
// fee cap and data fee cap, there's no singular parameter to create a total
|
|
// price ordering on. What's more, since the base fee and blob fee can move
|
|
// independently of one another, there's no pre-defined way to combine them
|
|
// into a stable order either. This leads to a multi-dimensional problem to
|
|
// solve after every block.
|
|
//
|
|
// - The first observation is that comparing 1559 base fees or 4844 blob fees
|
|
// needs to happen in the context of their dynamism. Since these fees jump
|
|
// up or down in ~1.125 multipliers (at max) across blocks, comparing fees
|
|
// in two transactions should be based on log1.125(fee) to eliminate noise.
|
|
//
|
|
// - The second observation is that the basefee and blobfee move independently,
|
|
// so there's no way to split mixed txs on their own (A has higher base fee,
|
|
// B has higher blob fee). Rather than look at the absolute fees, the useful
|
|
// metric is the max time it can take to exceed the transaction's fee caps.
|
|
// Specifically, we're interested in the number of jumps needed to go from
|
|
// the current fee to the transaction's cap:
|
|
//
|
|
// jumps = log1.125(txfee) - log1.125(basefee)
|
|
//
|
|
// - The third observation is that the base fee tends to hover around rather
|
|
// than swing wildly. The number of jumps needed from the current fee starts
|
|
// to get less relevant the higher it is. To remove the noise here too, the
|
|
// pool will use log(jumps) as the delta for comparing transactions.
|
|
//
|
|
// delta = sign(jumps) * log(abs(jumps))
|
|
//
|
|
// - To establish a total order, we need to reduce the dimensionality of the
|
|
// two base fees (log jumps) to a single value. The interesting aspect from
|
|
// the pool's perspective is how fast will a tx get executable (fees going
|
|
// down, crossing the smaller negative jump counter) or non-executable (fees
|
|
// going up, crossing the smaller positive jump counter). As such, the pool
|
|
// cares only about the min of the two delta values for eviction priority.
|
|
//
|
|
// priority = min(deltaBasefee, deltaBlobfee)
|
|
//
|
|
// - The above very aggressive dimensionality and noise reduction should result
|
|
// in transaction being grouped into a small number of buckets, the further
|
|
// the fees the larger the buckets. This is good because it allows us to use
|
|
// the miner tip meaningfully as a splitter.
|
|
//
|
|
// - For the scenario where the pool does not contain non-executable blob txs
|
|
// anymore, it does not make sense to grant a later eviction priority to txs
|
|
// with high fee caps since it could enable pool wars. As such, any positive
|
|
// priority will be grouped together.
|
|
//
|
|
// priority = min(deltaBasefee, deltaBlobfee, 0)
|
|
//
|
|
// Optimisation tradeoffs:
|
|
//
|
|
// - Eviction relies on 3 fee minimums per account (exec tip, exec cap and blob
|
|
// cap). Maintaining these values across all transactions from the account is
|
|
// problematic as each transaction replacement or inclusion would require a
|
|
// rescan of all other transactions to recalculate the minimum. Instead, the
|
|
// pool maintains a rolling minimum across the nonce range. Updating all the
|
|
// minimums will need to be done only starting at the swapped in/out nonce
|
|
// and leading up to the first no-change.
|
|
type BlobPool struct {
|
|
config Config // Pool configuration
|
|
reserve txpool.AddressReserver // Address reserver to ensure exclusivity across subpools
|
|
|
|
store billy.Database // Persistent data store for the tx metadata and blobs
|
|
stored uint64 // Useful data size of all transactions on disk
|
|
limbo *limbo // Persistent data store for the non-finalized blobs
|
|
|
|
signer types.Signer // Transaction signer to use for sender recovery
|
|
chain BlockChain // Chain object to access the state through
|
|
|
|
head *types.Header // Current head of the chain
|
|
state *state.StateDB // Current state at the head of the chain
|
|
gasTip *uint256.Int // Currently accepted minimum gas tip
|
|
|
|
lookup *lookup // Lookup table mapping blobs to txs and txs to billy entries
|
|
index map[common.Address][]*blobTxMeta // Blob transactions grouped by accounts, sorted by nonce
|
|
spent map[common.Address]*uint256.Int // Expenditure tracking for individual accounts
|
|
evict *evictHeap // Heap of cheapest accounts for eviction when full
|
|
|
|
discoverFeed event.Feed // Event feed to send out new tx events on pool discovery (reorg excluded)
|
|
insertFeed event.Feed // Event feed to send out new tx events on pool inclusion (reorg included)
|
|
|
|
// txValidationFn defaults to txpool.ValidateTransaction, but can be
|
|
// overridden for testing purposes.
|
|
txValidationFn txpool.ValidationFunction
|
|
|
|
lock sync.RWMutex // Mutex protecting the pool during reorg handling
|
|
}
|
|
|
|
// New creates a new blob transaction pool to gather, sort and filter inbound
|
|
// blob transactions from the network.
|
|
func New(config Config, chain BlockChain) *BlobPool {
|
|
// Sanitize the input to ensure no vulnerable gas prices are set
|
|
config = (&config).sanitize()
|
|
|
|
// Create the transaction pool with its initial settings
|
|
return &BlobPool{
|
|
config: config,
|
|
signer: types.LatestSigner(chain.Config()),
|
|
chain: chain,
|
|
lookup: newLookup(),
|
|
index: make(map[common.Address][]*blobTxMeta),
|
|
spent: make(map[common.Address]*uint256.Int),
|
|
txValidationFn: txpool.ValidateTransaction,
|
|
}
|
|
}
|
|
|
|
// Filter returns whether the given transaction can be consumed by the blob pool.
|
|
func (p *BlobPool) Filter(tx *types.Transaction) bool {
|
|
return tx.Type() == types.BlobTxType
|
|
}
|
|
|
|
// Init sets the gas price needed to keep a transaction in the pool and the chain
|
|
// head to allow balance / nonce checks. The transaction journal will be loaded
|
|
// from disk and filtered based on the provided starting settings.
|
|
func (p *BlobPool) Init(gasTip uint64, head *types.Header, reserve txpool.AddressReserver) error {
|
|
p.reserve = reserve
|
|
|
|
var (
|
|
queuedir string
|
|
limbodir string
|
|
)
|
|
if p.config.Datadir != "" {
|
|
queuedir = filepath.Join(p.config.Datadir, pendingTransactionStore)
|
|
if err := os.MkdirAll(queuedir, 0700); err != nil {
|
|
return err
|
|
}
|
|
limbodir = filepath.Join(p.config.Datadir, limboedTransactionStore)
|
|
if err := os.MkdirAll(limbodir, 0700); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
// Initialize the state with head block, or fallback to empty one in
|
|
// case the head state is not available (might occur when node is not
|
|
// fully synced).
|
|
state, err := p.chain.StateAt(head.Root)
|
|
if err != nil {
|
|
state, err = p.chain.StateAt(types.EmptyRootHash)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
p.head, p.state = head, state
|
|
|
|
// Index all transactions on disk and delete anything unprocessable
|
|
var fails []uint64
|
|
index := func(id uint64, size uint32, blob []byte) {
|
|
if p.parseTransaction(id, size, blob) != nil {
|
|
fails = append(fails, id)
|
|
}
|
|
}
|
|
slotter := newSlotter(eip4844.LatestMaxBlobsPerBlock(p.chain.Config()))
|
|
store, err := billy.Open(billy.Options{Path: queuedir, Repair: true}, slotter, index)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
p.store = store
|
|
|
|
if len(fails) > 0 {
|
|
log.Warn("Dropping invalidated blob transactions", "ids", fails)
|
|
dropInvalidMeter.Mark(int64(len(fails)))
|
|
|
|
for _, id := range fails {
|
|
if err := p.store.Delete(id); err != nil {
|
|
p.Close()
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
// Sort the indexed transactions by nonce and delete anything gapped, create
|
|
// the eviction heap of anyone still standing
|
|
for addr := range p.index {
|
|
p.recheck(addr, nil)
|
|
}
|
|
var (
|
|
basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), p.head))
|
|
blobfee = uint256.NewInt(params.BlobTxMinBlobGasprice)
|
|
)
|
|
if p.head.ExcessBlobGas != nil {
|
|
blobfee = uint256.MustFromBig(eip4844.CalcBlobFee(p.chain.Config(), p.head))
|
|
}
|
|
p.evict = newPriceHeap(basefee, blobfee, p.index)
|
|
|
|
// Pool initialized, attach the blob limbo to it to track blobs included
|
|
// recently but not yet finalized
|
|
p.limbo, err = newLimbo(limbodir, eip4844.LatestMaxBlobsPerBlock(p.chain.Config()))
|
|
if err != nil {
|
|
p.Close()
|
|
return err
|
|
}
|
|
// Set the configured gas tip, triggering a filtering of anything just loaded
|
|
basefeeGauge.Update(int64(basefee.Uint64()))
|
|
blobfeeGauge.Update(int64(blobfee.Uint64()))
|
|
|
|
p.SetGasTip(new(big.Int).SetUint64(gasTip))
|
|
|
|
// Since the user might have modified their pool's capacity, evict anything
|
|
// above the current allowance
|
|
for p.stored > p.config.Datacap {
|
|
p.drop()
|
|
}
|
|
// Update the metrics and return the constructed pool
|
|
datacapGauge.Update(int64(p.config.Datacap))
|
|
p.updateStorageMetrics()
|
|
return nil
|
|
}
|
|
|
|
// Close closes down the underlying persistent store.
|
|
func (p *BlobPool) Close() error {
|
|
var errs []error
|
|
if p.limbo != nil { // Close might be invoked due to error in constructor, before p,limbo is set
|
|
if err := p.limbo.Close(); err != nil {
|
|
errs = append(errs, err)
|
|
}
|
|
}
|
|
if err := p.store.Close(); err != nil {
|
|
errs = append(errs, err)
|
|
}
|
|
switch {
|
|
case errs == nil:
|
|
return nil
|
|
case len(errs) == 1:
|
|
return errs[0]
|
|
default:
|
|
return fmt.Errorf("%v", errs)
|
|
}
|
|
}
|
|
|
|
// parseTransaction is a callback method on pool creation that gets called for
|
|
// each transaction on disk to create the in-memory metadata index.
|
|
func (p *BlobPool) parseTransaction(id uint64, size uint32, blob []byte) error {
|
|
tx := new(types.Transaction)
|
|
if err := rlp.DecodeBytes(blob, tx); err != nil {
|
|
// This path is impossible unless the disk data representation changes
|
|
// across restarts. For that ever improbable case, recover gracefully
|
|
// by ignoring this data entry.
|
|
log.Error("Failed to decode blob pool entry", "id", id, "err", err)
|
|
return err
|
|
}
|
|
if tx.BlobTxSidecar() == nil {
|
|
log.Error("Missing sidecar in blob pool entry", "id", id, "hash", tx.Hash())
|
|
return errors.New("missing blob sidecar")
|
|
}
|
|
|
|
meta := newBlobTxMeta(id, size, tx)
|
|
if p.lookup.exists(meta.hash) {
|
|
// This path is only possible after a crash, where deleted items are not
|
|
// removed via the normal shutdown-startup procedure and thus may get
|
|
// partially resurrected.
|
|
log.Error("Rejecting duplicate blob pool entry", "id", id, "hash", tx.Hash())
|
|
return errors.New("duplicate blob entry")
|
|
}
|
|
sender, err := types.Sender(p.signer, tx)
|
|
if err != nil {
|
|
// This path is impossible unless the signature validity changes across
|
|
// restarts. For that ever improbable case, recover gracefully by ignoring
|
|
// this data entry.
|
|
log.Error("Failed to recover blob tx sender", "id", id, "hash", tx.Hash(), "err", err)
|
|
return err
|
|
}
|
|
if _, ok := p.index[sender]; !ok {
|
|
if err := p.reserve(sender, true); err != nil {
|
|
return err
|
|
}
|
|
p.index[sender] = []*blobTxMeta{}
|
|
p.spent[sender] = new(uint256.Int)
|
|
}
|
|
p.index[sender] = append(p.index[sender], meta)
|
|
p.spent[sender] = new(uint256.Int).Add(p.spent[sender], meta.costCap)
|
|
|
|
p.lookup.track(meta)
|
|
p.stored += uint64(meta.size)
|
|
return nil
|
|
}
|
|
|
|
// recheck verifies the pool's content for a specific account and drops anything
|
|
// that does not fit anymore (dangling or filled nonce, overdraft).
|
|
func (p *BlobPool) recheck(addr common.Address, inclusions map[common.Hash]uint64) {
|
|
// Sort the transactions belonging to the account so reinjects can be simpler
|
|
txs := p.index[addr]
|
|
if inclusions != nil && txs == nil { // during reorgs, we might find new accounts
|
|
return
|
|
}
|
|
sort.Slice(txs, func(i, j int) bool {
|
|
return txs[i].nonce < txs[j].nonce
|
|
})
|
|
// If there is a gap between the chain state and the blob pool, drop
|
|
// all the transactions as they are non-executable. Similarly, if the
|
|
// entire tx range was included, drop all.
|
|
var (
|
|
next = p.state.GetNonce(addr)
|
|
gapped = txs[0].nonce > next
|
|
filled = txs[len(txs)-1].nonce < next
|
|
)
|
|
if gapped || filled {
|
|
var (
|
|
ids []uint64
|
|
nonces []uint64
|
|
)
|
|
for i := 0; i < len(txs); i++ {
|
|
ids = append(ids, txs[i].id)
|
|
nonces = append(nonces, txs[i].nonce)
|
|
|
|
p.stored -= uint64(txs[i].size)
|
|
p.lookup.untrack(txs[i])
|
|
|
|
// Included transactions blobs need to be moved to the limbo
|
|
if filled && inclusions != nil {
|
|
p.offload(addr, txs[i].nonce, txs[i].id, inclusions)
|
|
}
|
|
}
|
|
delete(p.index, addr)
|
|
delete(p.spent, addr)
|
|
if inclusions != nil { // only during reorgs will the heap be initialized
|
|
heap.Remove(p.evict, p.evict.index[addr])
|
|
}
|
|
p.reserve(addr, false)
|
|
|
|
if gapped {
|
|
log.Warn("Dropping dangling blob transactions", "from", addr, "missing", next, "drop", nonces, "ids", ids)
|
|
dropDanglingMeter.Mark(int64(len(ids)))
|
|
} else {
|
|
log.Trace("Dropping filled blob transactions", "from", addr, "filled", nonces, "ids", ids)
|
|
dropFilledMeter.Mark(int64(len(ids)))
|
|
}
|
|
for _, id := range ids {
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete blob transaction", "from", addr, "id", id, "err", err)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
// If there is overlap between the chain state and the blob pool, drop
|
|
// anything below the current state
|
|
if txs[0].nonce < next {
|
|
var (
|
|
ids []uint64
|
|
nonces []uint64
|
|
)
|
|
for len(txs) > 0 && txs[0].nonce < next {
|
|
ids = append(ids, txs[0].id)
|
|
nonces = append(nonces, txs[0].nonce)
|
|
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], txs[0].costCap)
|
|
p.stored -= uint64(txs[0].size)
|
|
p.lookup.untrack(txs[0])
|
|
|
|
// Included transactions blobs need to be moved to the limbo
|
|
if inclusions != nil {
|
|
p.offload(addr, txs[0].nonce, txs[0].id, inclusions)
|
|
}
|
|
txs = txs[1:]
|
|
}
|
|
log.Trace("Dropping overlapped blob transactions", "from", addr, "overlapped", nonces, "ids", ids, "left", len(txs))
|
|
dropOverlappedMeter.Mark(int64(len(ids)))
|
|
|
|
for _, id := range ids {
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete blob transaction", "from", addr, "id", id, "err", err)
|
|
}
|
|
}
|
|
p.index[addr] = txs
|
|
}
|
|
// Iterate over the transactions to initialize their eviction thresholds
|
|
// and to detect any nonce gaps
|
|
txs[0].evictionExecTip = txs[0].execTipCap
|
|
txs[0].evictionExecFeeJumps = txs[0].basefeeJumps
|
|
txs[0].evictionBlobFeeJumps = txs[0].blobfeeJumps
|
|
|
|
for i := 1; i < len(txs); i++ {
|
|
// If there's no nonce gap, initialize the eviction thresholds as the
|
|
// minimum between the cumulative thresholds and the current tx fees
|
|
if txs[i].nonce == txs[i-1].nonce+1 {
|
|
txs[i].evictionExecTip = txs[i-1].evictionExecTip
|
|
if txs[i].evictionExecTip.Cmp(txs[i].execTipCap) > 0 {
|
|
txs[i].evictionExecTip = txs[i].execTipCap
|
|
}
|
|
txs[i].evictionExecFeeJumps = txs[i-1].evictionExecFeeJumps
|
|
if txs[i].evictionExecFeeJumps > txs[i].basefeeJumps {
|
|
txs[i].evictionExecFeeJumps = txs[i].basefeeJumps
|
|
}
|
|
txs[i].evictionBlobFeeJumps = txs[i-1].evictionBlobFeeJumps
|
|
if txs[i].evictionBlobFeeJumps > txs[i].blobfeeJumps {
|
|
txs[i].evictionBlobFeeJumps = txs[i].blobfeeJumps
|
|
}
|
|
continue
|
|
}
|
|
// Sanity check that there's no double nonce. This case would generally
|
|
// be a coding error, so better know about it.
|
|
//
|
|
// Also, Billy behind the blobpool does not journal deletes. A process
|
|
// crash would result in previously deleted entities being resurrected.
|
|
// That could potentially cause a duplicate nonce to appear.
|
|
if txs[i].nonce == txs[i-1].nonce {
|
|
id, _ := p.lookup.storeidOfTx(txs[i].hash)
|
|
|
|
log.Error("Dropping repeat nonce blob transaction", "from", addr, "nonce", txs[i].nonce, "id", id)
|
|
dropRepeatedMeter.Mark(1)
|
|
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], txs[i].costCap)
|
|
p.stored -= uint64(txs[i].size)
|
|
p.lookup.untrack(txs[i])
|
|
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete blob transaction", "from", addr, "id", id, "err", err)
|
|
}
|
|
txs = append(txs[:i], txs[i+1:]...)
|
|
p.index[addr] = txs
|
|
|
|
i--
|
|
continue
|
|
}
|
|
// Otherwise if there's a nonce gap evict all later transactions
|
|
var (
|
|
ids []uint64
|
|
nonces []uint64
|
|
)
|
|
for j := i; j < len(txs); j++ {
|
|
ids = append(ids, txs[j].id)
|
|
nonces = append(nonces, txs[j].nonce)
|
|
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], txs[j].costCap)
|
|
p.stored -= uint64(txs[j].size)
|
|
p.lookup.untrack(txs[j])
|
|
}
|
|
txs = txs[:i]
|
|
|
|
log.Error("Dropping gapped blob transactions", "from", addr, "missing", txs[i-1].nonce+1, "drop", nonces, "ids", ids)
|
|
dropGappedMeter.Mark(int64(len(ids)))
|
|
|
|
for _, id := range ids {
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete blob transaction", "from", addr, "id", id, "err", err)
|
|
}
|
|
}
|
|
p.index[addr] = txs
|
|
break
|
|
}
|
|
// Ensure that there's no over-draft, this is expected to happen when some
|
|
// transactions get included without publishing on the network
|
|
var (
|
|
balance = p.state.GetBalance(addr)
|
|
spent = p.spent[addr]
|
|
)
|
|
if spent.Cmp(balance) > 0 {
|
|
// Evict the highest nonce transactions until the pending set falls under
|
|
// the account's available balance
|
|
var (
|
|
ids []uint64
|
|
nonces []uint64
|
|
)
|
|
for p.spent[addr].Cmp(balance) > 0 {
|
|
last := txs[len(txs)-1]
|
|
txs[len(txs)-1] = nil
|
|
txs = txs[:len(txs)-1]
|
|
|
|
ids = append(ids, last.id)
|
|
nonces = append(nonces, last.nonce)
|
|
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], last.costCap)
|
|
p.stored -= uint64(last.size)
|
|
p.lookup.untrack(last)
|
|
}
|
|
if len(txs) == 0 {
|
|
delete(p.index, addr)
|
|
delete(p.spent, addr)
|
|
if inclusions != nil { // only during reorgs will the heap be initialized
|
|
heap.Remove(p.evict, p.evict.index[addr])
|
|
}
|
|
p.reserve(addr, false)
|
|
} else {
|
|
p.index[addr] = txs
|
|
}
|
|
log.Warn("Dropping overdrafted blob transactions", "from", addr, "balance", balance, "spent", spent, "drop", nonces, "ids", ids)
|
|
dropOverdraftedMeter.Mark(int64(len(ids)))
|
|
|
|
for _, id := range ids {
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete blob transaction", "from", addr, "id", id, "err", err)
|
|
}
|
|
}
|
|
}
|
|
// Sanity check that no account can have more queued transactions than the
|
|
// DoS protection threshold.
|
|
if len(txs) > maxTxsPerAccount {
|
|
// Evict the highest nonce transactions until the pending set falls under
|
|
// the account's transaction cap
|
|
var (
|
|
ids []uint64
|
|
nonces []uint64
|
|
)
|
|
for len(txs) > maxTxsPerAccount {
|
|
last := txs[len(txs)-1]
|
|
txs[len(txs)-1] = nil
|
|
txs = txs[:len(txs)-1]
|
|
|
|
ids = append(ids, last.id)
|
|
nonces = append(nonces, last.nonce)
|
|
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], last.costCap)
|
|
p.stored -= uint64(last.size)
|
|
p.lookup.untrack(last)
|
|
}
|
|
p.index[addr] = txs
|
|
|
|
log.Warn("Dropping overcapped blob transactions", "from", addr, "kept", len(txs), "drop", nonces, "ids", ids)
|
|
dropOvercappedMeter.Mark(int64(len(ids)))
|
|
|
|
for _, id := range ids {
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete blob transaction", "from", addr, "id", id, "err", err)
|
|
}
|
|
}
|
|
}
|
|
// Included cheap transactions might have left the remaining ones better from
|
|
// an eviction point, fix any potential issues in the heap.
|
|
if _, ok := p.index[addr]; ok && inclusions != nil {
|
|
heap.Fix(p.evict, p.evict.index[addr])
|
|
}
|
|
}
|
|
|
|
// offload removes a tracked blob transaction from the pool and moves it into the
|
|
// limbo for tracking until finality.
|
|
//
|
|
// The method may log errors for various unexpected scenarios but will not return
|
|
// any of it since there's no clear error case. Some errors may be due to coding
|
|
// issues, others caused by signers mining MEV stuff or swapping transactions. In
|
|
// all cases, the pool needs to continue operating.
|
|
func (p *BlobPool) offload(addr common.Address, nonce uint64, id uint64, inclusions map[common.Hash]uint64) {
|
|
data, err := p.store.Get(id)
|
|
if err != nil {
|
|
log.Error("Blobs missing for included transaction", "from", addr, "nonce", nonce, "id", id, "err", err)
|
|
return
|
|
}
|
|
var tx types.Transaction
|
|
if err = rlp.DecodeBytes(data, &tx); err != nil {
|
|
log.Error("Blobs corrupted for included transaction", "from", addr, "nonce", nonce, "id", id, "err", err)
|
|
return
|
|
}
|
|
block, ok := inclusions[tx.Hash()]
|
|
if !ok {
|
|
log.Warn("Blob transaction swapped out by signer", "from", addr, "nonce", nonce, "id", id)
|
|
return
|
|
}
|
|
if err := p.limbo.push(&tx, block); err != nil {
|
|
log.Warn("Failed to offload blob tx into limbo", "err", err)
|
|
return
|
|
}
|
|
}
|
|
|
|
// Reset implements txpool.SubPool, allowing the blob pool's internal state to be
|
|
// kept in sync with the main transaction pool's internal state.
|
|
func (p *BlobPool) Reset(oldHead, newHead *types.Header) {
|
|
waitStart := time.Now()
|
|
p.lock.Lock()
|
|
resetwaitHist.Update(time.Since(waitStart).Nanoseconds())
|
|
defer p.lock.Unlock()
|
|
|
|
defer func(start time.Time) {
|
|
resettimeHist.Update(time.Since(start).Nanoseconds())
|
|
}(time.Now())
|
|
|
|
statedb, err := p.chain.StateAt(newHead.Root)
|
|
if err != nil {
|
|
log.Error("Failed to reset blobpool state", "err", err)
|
|
return
|
|
}
|
|
p.head = newHead
|
|
p.state = statedb
|
|
|
|
// Run the reorg between the old and new head and figure out which accounts
|
|
// need to be rechecked and which transactions need to be readded
|
|
if reinject, inclusions := p.reorg(oldHead, newHead); reinject != nil {
|
|
var adds []*types.Transaction
|
|
for addr, txs := range reinject {
|
|
// Blindly push all the lost transactions back into the pool
|
|
for _, tx := range txs {
|
|
if err := p.reinject(addr, tx.Hash()); err == nil {
|
|
adds = append(adds, tx.WithoutBlobTxSidecar())
|
|
}
|
|
}
|
|
// Recheck the account's pooled transactions to drop included and
|
|
// invalidated ones
|
|
p.recheck(addr, inclusions)
|
|
}
|
|
if len(adds) > 0 {
|
|
p.insertFeed.Send(core.NewTxsEvent{Txs: adds})
|
|
}
|
|
}
|
|
// Flush out any blobs from limbo that are older than the latest finality
|
|
if p.chain.Config().IsCancun(p.head.Number, p.head.Time) {
|
|
p.limbo.finalize(p.chain.CurrentFinalBlock())
|
|
}
|
|
// Reset the price heap for the new set of basefee/blobfee pairs
|
|
var (
|
|
basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), newHead))
|
|
blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinBlobGasprice))
|
|
)
|
|
if newHead.ExcessBlobGas != nil {
|
|
blobfee = uint256.MustFromBig(eip4844.CalcBlobFee(p.chain.Config(), newHead))
|
|
}
|
|
p.evict.reinit(basefee, blobfee, false)
|
|
|
|
basefeeGauge.Update(int64(basefee.Uint64()))
|
|
blobfeeGauge.Update(int64(blobfee.Uint64()))
|
|
p.updateStorageMetrics()
|
|
}
|
|
|
|
// reorg assembles all the transactors and missing transactions between an old
|
|
// and new head to figure out which account's tx set needs to be rechecked and
|
|
// which transactions need to be requeued.
|
|
//
|
|
// The transactionblock inclusion infos are also returned to allow tracking any
|
|
// just-included blocks by block number in the limbo.
|
|
func (p *BlobPool) reorg(oldHead, newHead *types.Header) (map[common.Address][]*types.Transaction, map[common.Hash]uint64) {
|
|
// If the pool was not yet initialized, don't do anything
|
|
if oldHead == nil {
|
|
return nil, nil
|
|
}
|
|
// If the reorg is too deep, avoid doing it (will happen during snap sync)
|
|
oldNum := oldHead.Number.Uint64()
|
|
newNum := newHead.Number.Uint64()
|
|
|
|
if depth := uint64(math.Abs(float64(oldNum) - float64(newNum))); depth > 64 {
|
|
return nil, nil
|
|
}
|
|
// Reorg seems shallow enough to pull in all transactions into memory
|
|
var (
|
|
transactors = make(map[common.Address]struct{})
|
|
discarded = make(map[common.Address][]*types.Transaction)
|
|
included = make(map[common.Address][]*types.Transaction)
|
|
inclusions = make(map[common.Hash]uint64)
|
|
|
|
rem = p.chain.GetBlock(oldHead.Hash(), oldHead.Number.Uint64())
|
|
add = p.chain.GetBlock(newHead.Hash(), newHead.Number.Uint64())
|
|
)
|
|
if add == nil {
|
|
// if the new head is nil, it means that something happened between
|
|
// the firing of newhead-event and _now_: most likely a
|
|
// reorg caused by sync-reversion or explicit sethead back to an
|
|
// earlier block.
|
|
log.Warn("Blobpool reset with missing new head", "number", newHead.Number, "hash", newHead.Hash())
|
|
return nil, nil
|
|
}
|
|
if rem == nil {
|
|
// This can happen if a setHead is performed, where we simply discard
|
|
// the old head from the chain. If that is the case, we don't have the
|
|
// lost transactions anymore, and there's nothing to add.
|
|
if newNum >= oldNum {
|
|
// If we reorged to a same or higher number, then it's not a case
|
|
// of setHead
|
|
log.Warn("Blobpool reset with missing old head",
|
|
"old", oldHead.Hash(), "oldnum", oldNum, "new", newHead.Hash(), "newnum", newNum)
|
|
return nil, nil
|
|
}
|
|
// If the reorg ended up on a lower number, it's indicative of setHead
|
|
// being the cause
|
|
log.Debug("Skipping blobpool reset caused by setHead",
|
|
"old", oldHead.Hash(), "oldnum", oldNum, "new", newHead.Hash(), "newnum", newNum)
|
|
return nil, nil
|
|
}
|
|
// Both old and new blocks exist, traverse through the progression chain
|
|
// and accumulate the transactors and transactions
|
|
for rem.NumberU64() > add.NumberU64() {
|
|
for _, tx := range rem.Transactions() {
|
|
from, _ := types.Sender(p.signer, tx)
|
|
|
|
discarded[from] = append(discarded[from], tx)
|
|
transactors[from] = struct{}{}
|
|
}
|
|
if rem = p.chain.GetBlock(rem.ParentHash(), rem.NumberU64()-1); rem == nil {
|
|
log.Error("Unrooted old chain seen by blobpool", "block", oldHead.Number, "hash", oldHead.Hash())
|
|
return nil, nil
|
|
}
|
|
}
|
|
for add.NumberU64() > rem.NumberU64() {
|
|
for _, tx := range add.Transactions() {
|
|
from, _ := types.Sender(p.signer, tx)
|
|
|
|
included[from] = append(included[from], tx)
|
|
inclusions[tx.Hash()] = add.NumberU64()
|
|
transactors[from] = struct{}{}
|
|
}
|
|
if add = p.chain.GetBlock(add.ParentHash(), add.NumberU64()-1); add == nil {
|
|
log.Error("Unrooted new chain seen by blobpool", "block", newHead.Number, "hash", newHead.Hash())
|
|
return nil, nil
|
|
}
|
|
}
|
|
for rem.Hash() != add.Hash() {
|
|
for _, tx := range rem.Transactions() {
|
|
from, _ := types.Sender(p.signer, tx)
|
|
|
|
discarded[from] = append(discarded[from], tx)
|
|
transactors[from] = struct{}{}
|
|
}
|
|
if rem = p.chain.GetBlock(rem.ParentHash(), rem.NumberU64()-1); rem == nil {
|
|
log.Error("Unrooted old chain seen by blobpool", "block", oldHead.Number, "hash", oldHead.Hash())
|
|
return nil, nil
|
|
}
|
|
for _, tx := range add.Transactions() {
|
|
from, _ := types.Sender(p.signer, tx)
|
|
|
|
included[from] = append(included[from], tx)
|
|
inclusions[tx.Hash()] = add.NumberU64()
|
|
transactors[from] = struct{}{}
|
|
}
|
|
if add = p.chain.GetBlock(add.ParentHash(), add.NumberU64()-1); add == nil {
|
|
log.Error("Unrooted new chain seen by blobpool", "block", newHead.Number, "hash", newHead.Hash())
|
|
return nil, nil
|
|
}
|
|
}
|
|
// Generate the set of transactions per address to pull back into the pool,
|
|
// also updating the rest along the way
|
|
reinject := make(map[common.Address][]*types.Transaction, len(transactors))
|
|
for addr := range transactors {
|
|
// Generate the set that was lost to reinject into the pool
|
|
lost := make([]*types.Transaction, 0, len(discarded[addr]))
|
|
for _, tx := range types.TxDifference(discarded[addr], included[addr]) {
|
|
if p.Filter(tx) {
|
|
lost = append(lost, tx)
|
|
}
|
|
}
|
|
reinject[addr] = lost
|
|
|
|
// Update the set that was already reincluded to track the blocks in limbo
|
|
for _, tx := range types.TxDifference(included[addr], discarded[addr]) {
|
|
if p.Filter(tx) {
|
|
p.limbo.update(tx.Hash(), inclusions[tx.Hash()])
|
|
}
|
|
}
|
|
}
|
|
return reinject, inclusions
|
|
}
|
|
|
|
// reinject blindly pushes a transaction previously included in the chain - and
|
|
// just reorged out - into the pool. The transaction is assumed valid (having
|
|
// been in the chain), thus the only validation needed is nonce sorting and over-
|
|
// draft checks after injection.
|
|
//
|
|
// Note, the method will not initialize the eviction cache values as those will
|
|
// be done once for all transactions belonging to an account after all individual
|
|
// transactions are injected back into the pool.
|
|
func (p *BlobPool) reinject(addr common.Address, txhash common.Hash) error {
|
|
// Retrieve the associated blob from the limbo. Without the blobs, we cannot
|
|
// add the transaction back into the pool as it is not mineable.
|
|
tx, err := p.limbo.pull(txhash)
|
|
if err != nil {
|
|
log.Error("Blobs unavailable, dropping reorged tx", "err", err)
|
|
return err
|
|
}
|
|
// TODO: seems like an easy optimization here would be getting the serialized tx
|
|
// from limbo instead of re-serializing it here.
|
|
|
|
// Serialize the transaction back into the primary datastore.
|
|
blob, err := rlp.EncodeToBytes(tx)
|
|
if err != nil {
|
|
log.Error("Failed to encode transaction for storage", "hash", tx.Hash(), "err", err)
|
|
return err
|
|
}
|
|
id, err := p.store.Put(blob)
|
|
if err != nil {
|
|
log.Error("Failed to write transaction into storage", "hash", tx.Hash(), "err", err)
|
|
return err
|
|
}
|
|
|
|
// Update the indices and metrics
|
|
meta := newBlobTxMeta(id, p.store.Size(id), tx)
|
|
if _, ok := p.index[addr]; !ok {
|
|
if err := p.reserve(addr, true); err != nil {
|
|
log.Warn("Failed to reserve account for blob pool", "tx", tx.Hash(), "from", addr, "err", err)
|
|
return err
|
|
}
|
|
p.index[addr] = []*blobTxMeta{meta}
|
|
p.spent[addr] = meta.costCap
|
|
p.evict.Push(addr)
|
|
} else {
|
|
p.index[addr] = append(p.index[addr], meta)
|
|
p.spent[addr] = new(uint256.Int).Add(p.spent[addr], meta.costCap)
|
|
}
|
|
p.lookup.track(meta)
|
|
p.stored += uint64(meta.size)
|
|
return nil
|
|
}
|
|
|
|
// SetGasTip implements txpool.SubPool, allowing the blob pool's gas requirements
|
|
// to be kept in sync with the main transaction pool's gas requirements.
|
|
func (p *BlobPool) SetGasTip(tip *big.Int) {
|
|
p.lock.Lock()
|
|
defer p.lock.Unlock()
|
|
|
|
// Store the new minimum gas tip
|
|
old := p.gasTip
|
|
p.gasTip = uint256.MustFromBig(tip)
|
|
|
|
// If the min miner fee increased, remove transactions below the new threshold
|
|
if old == nil || p.gasTip.Cmp(old) > 0 {
|
|
for addr, txs := range p.index {
|
|
for i, tx := range txs {
|
|
if tx.execTipCap.Cmp(p.gasTip) < 0 {
|
|
// Drop the offending transaction
|
|
var (
|
|
ids = []uint64{tx.id}
|
|
nonces = []uint64{tx.nonce}
|
|
)
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], txs[i].costCap)
|
|
p.stored -= uint64(tx.size)
|
|
p.lookup.untrack(tx)
|
|
txs[i] = nil
|
|
|
|
// Drop everything afterwards, no gaps allowed
|
|
for j, tx := range txs[i+1:] {
|
|
ids = append(ids, tx.id)
|
|
nonces = append(nonces, tx.nonce)
|
|
|
|
p.spent[addr] = new(uint256.Int).Sub(p.spent[addr], tx.costCap)
|
|
p.stored -= uint64(tx.size)
|
|
p.lookup.untrack(tx)
|
|
txs[i+1+j] = nil
|
|
}
|
|
// Clear out the dropped transactions from the index
|
|
if i > 0 {
|
|
p.index[addr] = txs[:i]
|
|
heap.Fix(p.evict, p.evict.index[addr])
|
|
} else {
|
|
delete(p.index, addr)
|
|
delete(p.spent, addr)
|
|
|
|
heap.Remove(p.evict, p.evict.index[addr])
|
|
p.reserve(addr, false)
|
|
}
|
|
// Clear out the transactions from the data store
|
|
log.Warn("Dropping underpriced blob transaction", "from", addr, "rejected", tx.nonce, "tip", tx.execTipCap, "want", tip, "drop", nonces, "ids", ids)
|
|
dropUnderpricedMeter.Mark(int64(len(ids)))
|
|
|
|
for _, id := range ids {
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Error("Failed to delete dropped transaction", "id", id, "err", err)
|
|
}
|
|
}
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
log.Debug("Blobpool tip threshold updated", "tip", tip)
|
|
pooltipGauge.Update(tip.Int64())
|
|
p.updateStorageMetrics()
|
|
}
|
|
|
|
// ValidateTxBasics checks whether a transaction is valid according to the consensus
|
|
// rules, but does not check state-dependent validation such as sufficient balance.
|
|
// This check is meant as an early check which only needs to be performed once,
|
|
// and does not require the pool mutex to be held.
|
|
func (p *BlobPool) ValidateTxBasics(tx *types.Transaction) error {
|
|
opts := &txpool.ValidationOptions{
|
|
Config: p.chain.Config(),
|
|
Accept: 1 << types.BlobTxType,
|
|
MaxSize: txMaxSize,
|
|
MinTip: p.gasTip.ToBig(),
|
|
}
|
|
return txpool.ValidateTransaction(tx, p.head, p.signer, opts)
|
|
}
|
|
|
|
// validateTx checks whether a transaction is valid according to the consensus
|
|
// rules and adheres to some heuristic limits of the local node (price and size).
|
|
func (p *BlobPool) validateTx(tx *types.Transaction) error {
|
|
if err := p.ValidateTxBasics(tx); err != nil {
|
|
return err
|
|
}
|
|
// Ensure the transaction adheres to the stateful pool filters (nonce, balance)
|
|
stateOpts := &txpool.ValidationOptionsWithState{
|
|
State: p.state,
|
|
|
|
FirstNonceGap: func(addr common.Address) uint64 {
|
|
// Nonce gaps are not permitted in the blob pool, the first gap will
|
|
// be the next nonce shifted by however many transactions we already
|
|
// have pooled.
|
|
return p.state.GetNonce(addr) + uint64(len(p.index[addr]))
|
|
},
|
|
UsedAndLeftSlots: func(addr common.Address) (int, int) {
|
|
have := len(p.index[addr])
|
|
if have >= maxTxsPerAccount {
|
|
return have, 0
|
|
}
|
|
return have, maxTxsPerAccount - have
|
|
},
|
|
ExistingExpenditure: func(addr common.Address) *big.Int {
|
|
if spent := p.spent[addr]; spent != nil {
|
|
return spent.ToBig()
|
|
}
|
|
return new(big.Int)
|
|
},
|
|
ExistingCost: func(addr common.Address, nonce uint64) *big.Int {
|
|
next := p.state.GetNonce(addr)
|
|
if uint64(len(p.index[addr])) > nonce-next {
|
|
return p.index[addr][int(nonce-next)].costCap.ToBig()
|
|
}
|
|
return nil
|
|
},
|
|
}
|
|
if err := txpool.ValidateTransactionWithState(tx, p.signer, stateOpts); err != nil {
|
|
return err
|
|
}
|
|
// If the transaction replaces an existing one, ensure that price bumps are
|
|
// adhered to.
|
|
var (
|
|
from, _ = types.Sender(p.signer, tx) // already validated above
|
|
next = p.state.GetNonce(from)
|
|
)
|
|
if uint64(len(p.index[from])) > tx.Nonce()-next {
|
|
prev := p.index[from][int(tx.Nonce()-next)]
|
|
// Ensure the transaction is different than the one tracked locally
|
|
if prev.hash == tx.Hash() {
|
|
return txpool.ErrAlreadyKnown
|
|
}
|
|
// Account can support the replacement, but the price bump must also be met
|
|
switch {
|
|
case tx.GasFeeCapIntCmp(prev.execFeeCap.ToBig()) <= 0:
|
|
return fmt.Errorf("%w: new tx gas fee cap %v <= %v queued", txpool.ErrReplaceUnderpriced, tx.GasFeeCap(), prev.execFeeCap)
|
|
case tx.GasTipCapIntCmp(prev.execTipCap.ToBig()) <= 0:
|
|
return fmt.Errorf("%w: new tx gas tip cap %v <= %v queued", txpool.ErrReplaceUnderpriced, tx.GasTipCap(), prev.execTipCap)
|
|
case tx.BlobGasFeeCapIntCmp(prev.blobFeeCap.ToBig()) <= 0:
|
|
return fmt.Errorf("%w: new tx blob gas fee cap %v <= %v queued", txpool.ErrReplaceUnderpriced, tx.BlobGasFeeCap(), prev.blobFeeCap)
|
|
}
|
|
var (
|
|
multiplier = uint256.NewInt(100 + p.config.PriceBump)
|
|
onehundred = uint256.NewInt(100)
|
|
|
|
minGasFeeCap = new(uint256.Int).Div(new(uint256.Int).Mul(multiplier, prev.execFeeCap), onehundred)
|
|
minGasTipCap = new(uint256.Int).Div(new(uint256.Int).Mul(multiplier, prev.execTipCap), onehundred)
|
|
minBlobGasFeeCap = new(uint256.Int).Div(new(uint256.Int).Mul(multiplier, prev.blobFeeCap), onehundred)
|
|
)
|
|
switch {
|
|
case tx.GasFeeCapIntCmp(minGasFeeCap.ToBig()) < 0:
|
|
return fmt.Errorf("%w: new tx gas fee cap %v < %v queued + %d%% replacement penalty", txpool.ErrReplaceUnderpriced, tx.GasFeeCap(), prev.execFeeCap, p.config.PriceBump)
|
|
case tx.GasTipCapIntCmp(minGasTipCap.ToBig()) < 0:
|
|
return fmt.Errorf("%w: new tx gas tip cap %v < %v queued + %d%% replacement penalty", txpool.ErrReplaceUnderpriced, tx.GasTipCap(), prev.execTipCap, p.config.PriceBump)
|
|
case tx.BlobGasFeeCapIntCmp(minBlobGasFeeCap.ToBig()) < 0:
|
|
return fmt.Errorf("%w: new tx blob gas fee cap %v < %v queued + %d%% replacement penalty", txpool.ErrReplaceUnderpriced, tx.BlobGasFeeCap(), prev.blobFeeCap, p.config.PriceBump)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Has returns an indicator whether subpool has a transaction cached with the
|
|
// given hash.
|
|
func (p *BlobPool) Has(hash common.Hash) bool {
|
|
p.lock.RLock()
|
|
defer p.lock.RUnlock()
|
|
|
|
return p.lookup.exists(hash)
|
|
}
|
|
|
|
// Get returns a transaction if it is contained in the pool, or nil otherwise.
|
|
func (p *BlobPool) Get(hash common.Hash) *types.Transaction {
|
|
// Track the amount of time waiting to retrieve a fully resolved blob tx from
|
|
// the pool and the amount of time actually spent on pulling the data from disk.
|
|
getStart := time.Now()
|
|
p.lock.RLock()
|
|
getwaitHist.Update(time.Since(getStart).Nanoseconds())
|
|
defer p.lock.RUnlock()
|
|
|
|
defer func(start time.Time) {
|
|
gettimeHist.Update(time.Since(start).Nanoseconds())
|
|
}(time.Now())
|
|
|
|
// Pull the blob from disk and return an assembled response
|
|
id, ok := p.lookup.storeidOfTx(hash)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
data, err := p.store.Get(id)
|
|
if err != nil {
|
|
log.Error("Tracked blob transaction missing from store", "hash", hash, "id", id, "err", err)
|
|
return nil
|
|
}
|
|
item := new(types.Transaction)
|
|
if err = rlp.DecodeBytes(data, item); err != nil {
|
|
log.Error("Blobs corrupted for traced transaction", "hash", hash, "id", id, "err", err)
|
|
return nil
|
|
}
|
|
return item
|
|
}
|
|
|
|
// GetBlobs returns a number of blobs are proofs for the given versioned hashes.
|
|
// This is a utility method for the engine API, enabling consensus clients to
|
|
// retrieve blobs from the pools directly instead of the network.
|
|
func (p *BlobPool) GetBlobs(vhashes []common.Hash) ([]*kzg4844.Blob, []*kzg4844.Proof) {
|
|
// Create a map of the blob hash to indices for faster fills
|
|
var (
|
|
blobs = make([]*kzg4844.Blob, len(vhashes))
|
|
proofs = make([]*kzg4844.Proof, len(vhashes))
|
|
)
|
|
index := make(map[common.Hash]int)
|
|
for i, vhash := range vhashes {
|
|
index[vhash] = i
|
|
}
|
|
// Iterate over the blob hashes, pulling transactions that fill it. Take care
|
|
// to also fill anything else the transaction might include (probably will).
|
|
for i, vhash := range vhashes {
|
|
// If already filled by a previous fetch, skip
|
|
if blobs[i] != nil {
|
|
continue
|
|
}
|
|
// Unfilled, retrieve the datastore item (in a short lock)
|
|
p.lock.RLock()
|
|
id, exists := p.lookup.storeidOfBlob(vhash)
|
|
if !exists {
|
|
p.lock.RUnlock()
|
|
continue
|
|
}
|
|
data, err := p.store.Get(id)
|
|
p.lock.RUnlock()
|
|
|
|
// After releasing the lock, try to fill any blobs requested
|
|
if err != nil {
|
|
log.Error("Tracked blob transaction missing from store", "id", id, "err", err)
|
|
continue
|
|
}
|
|
item := new(types.Transaction)
|
|
if err = rlp.DecodeBytes(data, item); err != nil {
|
|
log.Error("Blobs corrupted for traced transaction", "id", id, "err", err)
|
|
continue
|
|
}
|
|
// Fill anything requested, not just the current versioned hash
|
|
sidecar := item.BlobTxSidecar()
|
|
for j, blobhash := range item.BlobHashes() {
|
|
if idx, ok := index[blobhash]; ok {
|
|
blobs[idx] = &sidecar.Blobs[j]
|
|
proofs[idx] = &sidecar.Proofs[j]
|
|
}
|
|
}
|
|
}
|
|
return blobs, proofs
|
|
}
|
|
|
|
// Add inserts a set of blob transactions into the pool if they pass validation (both
|
|
// consensus validity and pool restrictions).
|
|
func (p *BlobPool) Add(txs []*types.Transaction, sync bool) []error {
|
|
var (
|
|
adds = make([]*types.Transaction, 0, len(txs))
|
|
errs = make([]error, len(txs))
|
|
)
|
|
for i, tx := range txs {
|
|
errs[i] = p.add(tx)
|
|
if errs[i] == nil {
|
|
adds = append(adds, tx.WithoutBlobTxSidecar())
|
|
}
|
|
}
|
|
if len(adds) > 0 {
|
|
p.discoverFeed.Send(core.NewTxsEvent{Txs: adds})
|
|
p.insertFeed.Send(core.NewTxsEvent{Txs: adds})
|
|
}
|
|
return errs
|
|
}
|
|
|
|
// add inserts a new blob transaction into the pool if it passes validation (both
|
|
// consensus validity and pool restrictions).
|
|
func (p *BlobPool) add(tx *types.Transaction) (err error) {
|
|
// The blob pool blocks on adding a transaction. This is because blob txs are
|
|
// only even pulled from the network, so this method will act as the overload
|
|
// protection for fetches.
|
|
waitStart := time.Now()
|
|
p.lock.Lock()
|
|
addwaitHist.Update(time.Since(waitStart).Nanoseconds())
|
|
defer p.lock.Unlock()
|
|
|
|
defer func(start time.Time) {
|
|
addtimeHist.Update(time.Since(start).Nanoseconds())
|
|
}(time.Now())
|
|
|
|
// Ensure the transaction is valid from all perspectives
|
|
if err := p.validateTx(tx); err != nil {
|
|
log.Trace("Transaction validation failed", "hash", tx.Hash(), "err", err)
|
|
switch {
|
|
case errors.Is(err, txpool.ErrUnderpriced):
|
|
addUnderpricedMeter.Mark(1)
|
|
case errors.Is(err, core.ErrNonceTooLow):
|
|
addStaleMeter.Mark(1)
|
|
case errors.Is(err, core.ErrNonceTooHigh):
|
|
addGappedMeter.Mark(1)
|
|
case errors.Is(err, core.ErrInsufficientFunds):
|
|
addOverdraftedMeter.Mark(1)
|
|
case errors.Is(err, txpool.ErrAccountLimitExceeded):
|
|
addOvercappedMeter.Mark(1)
|
|
case errors.Is(err, txpool.ErrReplaceUnderpriced):
|
|
addNoreplaceMeter.Mark(1)
|
|
default:
|
|
addInvalidMeter.Mark(1)
|
|
}
|
|
return err
|
|
}
|
|
// If the address is not yet known, request exclusivity to track the account
|
|
// only by this subpool until all transactions are evicted
|
|
from, _ := types.Sender(p.signer, tx) // already validated above
|
|
if _, ok := p.index[from]; !ok {
|
|
if err := p.reserve(from, true); err != nil {
|
|
addNonExclusiveMeter.Mark(1)
|
|
return err
|
|
}
|
|
defer func() {
|
|
// If the transaction is rejected by some post-validation check, remove
|
|
// the lock on the reservation set.
|
|
//
|
|
// Note, `err` here is the named error return, which will be initialized
|
|
// by a return statement before running deferred methods. Take care with
|
|
// removing or subscoping err as it will break this clause.
|
|
if err != nil {
|
|
p.reserve(from, false)
|
|
}
|
|
}()
|
|
}
|
|
// Transaction permitted into the pool from a nonce and cost perspective,
|
|
// insert it into the database and update the indices
|
|
blob, err := rlp.EncodeToBytes(tx)
|
|
if err != nil {
|
|
log.Error("Failed to encode transaction for storage", "hash", tx.Hash(), "err", err)
|
|
return err
|
|
}
|
|
id, err := p.store.Put(blob)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
meta := newBlobTxMeta(id, p.store.Size(id), tx)
|
|
|
|
var (
|
|
next = p.state.GetNonce(from)
|
|
offset = int(tx.Nonce() - next)
|
|
newacc = false
|
|
)
|
|
var oldEvictionExecFeeJumps, oldEvictionBlobFeeJumps float64
|
|
if txs, ok := p.index[from]; ok {
|
|
oldEvictionExecFeeJumps = txs[len(txs)-1].evictionExecFeeJumps
|
|
oldEvictionBlobFeeJumps = txs[len(txs)-1].evictionBlobFeeJumps
|
|
}
|
|
if len(p.index[from]) > offset {
|
|
// Transaction replaces a previously queued one
|
|
dropReplacedMeter.Mark(1)
|
|
|
|
prev := p.index[from][offset]
|
|
if err := p.store.Delete(prev.id); err != nil {
|
|
// Shitty situation, but try to recover gracefully instead of going boom
|
|
log.Error("Failed to delete replaced transaction", "id", prev.id, "err", err)
|
|
}
|
|
// Update the transaction index
|
|
p.index[from][offset] = meta
|
|
p.spent[from] = new(uint256.Int).Sub(p.spent[from], prev.costCap)
|
|
p.spent[from] = new(uint256.Int).Add(p.spent[from], meta.costCap)
|
|
|
|
p.lookup.untrack(prev)
|
|
p.lookup.track(meta)
|
|
p.stored += uint64(meta.size) - uint64(prev.size)
|
|
} else {
|
|
// Transaction extends previously scheduled ones
|
|
p.index[from] = append(p.index[from], meta)
|
|
if _, ok := p.spent[from]; !ok {
|
|
p.spent[from] = new(uint256.Int)
|
|
newacc = true
|
|
}
|
|
p.spent[from] = new(uint256.Int).Add(p.spent[from], meta.costCap)
|
|
p.lookup.track(meta)
|
|
p.stored += uint64(meta.size)
|
|
}
|
|
// Recompute the rolling eviction fields. In case of a replacement, this will
|
|
// recompute all subsequent fields. In case of an append, this will only do
|
|
// the fresh calculation.
|
|
txs := p.index[from]
|
|
|
|
for i := offset; i < len(txs); i++ {
|
|
// The first transaction will always use itself
|
|
if i == 0 {
|
|
txs[0].evictionExecTip = txs[0].execTipCap
|
|
txs[0].evictionExecFeeJumps = txs[0].basefeeJumps
|
|
txs[0].evictionBlobFeeJumps = txs[0].blobfeeJumps
|
|
|
|
continue
|
|
}
|
|
// Subsequent transactions will use a rolling calculation
|
|
txs[i].evictionExecTip = txs[i-1].evictionExecTip
|
|
if txs[i].evictionExecTip.Cmp(txs[i].execTipCap) > 0 {
|
|
txs[i].evictionExecTip = txs[i].execTipCap
|
|
}
|
|
txs[i].evictionExecFeeJumps = txs[i-1].evictionExecFeeJumps
|
|
if txs[i].evictionExecFeeJumps > txs[i].basefeeJumps {
|
|
txs[i].evictionExecFeeJumps = txs[i].basefeeJumps
|
|
}
|
|
txs[i].evictionBlobFeeJumps = txs[i-1].evictionBlobFeeJumps
|
|
if txs[i].evictionBlobFeeJumps > txs[i].blobfeeJumps {
|
|
txs[i].evictionBlobFeeJumps = txs[i].blobfeeJumps
|
|
}
|
|
}
|
|
// Update the eviction heap with the new information:
|
|
// - If the transaction is from a new account, add it to the heap
|
|
// - If the account had a singleton tx replaced, update the heap (new price caps)
|
|
// - If the account has a transaction replaced or appended, update the heap if significantly changed
|
|
switch {
|
|
case newacc:
|
|
heap.Push(p.evict, from)
|
|
|
|
case len(txs) == 1: // 1 tx and not a new acc, must be replacement
|
|
heap.Fix(p.evict, p.evict.index[from])
|
|
|
|
default: // replacement or new append
|
|
evictionExecFeeDiff := oldEvictionExecFeeJumps - txs[len(txs)-1].evictionExecFeeJumps
|
|
evictionBlobFeeDiff := oldEvictionBlobFeeJumps - txs[len(txs)-1].evictionBlobFeeJumps
|
|
|
|
if math.Abs(evictionExecFeeDiff) > 0.001 || math.Abs(evictionBlobFeeDiff) > 0.001 { // need math.Abs, can go up and down
|
|
heap.Fix(p.evict, p.evict.index[from])
|
|
}
|
|
}
|
|
// If the pool went over the allowed data limit, evict transactions until
|
|
// we're again below the threshold
|
|
for p.stored > p.config.Datacap {
|
|
p.drop()
|
|
}
|
|
p.updateStorageMetrics()
|
|
|
|
addValidMeter.Mark(1)
|
|
return nil
|
|
}
|
|
|
|
// drop removes the worst transaction from the pool. It is primarily used when a
|
|
// freshly added transaction overflows the pool and needs to evict something. The
|
|
// method is also called on startup if the user resizes their storage, might be an
|
|
// expensive run but it should be fine-ish.
|
|
func (p *BlobPool) drop() {
|
|
// Peek at the account with the worse transaction set to evict from (Go's heap
|
|
// stores the minimum at index zero of the heap slice) and retrieve it's last
|
|
// transaction.
|
|
var (
|
|
from = p.evict.addrs[0] // cannot call drop on empty pool
|
|
|
|
txs = p.index[from]
|
|
drop = txs[len(txs)-1]
|
|
last = len(txs) == 1
|
|
)
|
|
// Remove the transaction from the pool's index
|
|
if last {
|
|
delete(p.index, from)
|
|
delete(p.spent, from)
|
|
p.reserve(from, false)
|
|
} else {
|
|
txs[len(txs)-1] = nil
|
|
txs = txs[:len(txs)-1]
|
|
|
|
p.index[from] = txs
|
|
p.spent[from] = new(uint256.Int).Sub(p.spent[from], drop.costCap)
|
|
}
|
|
p.stored -= uint64(drop.size)
|
|
p.lookup.untrack(drop)
|
|
|
|
// Remove the transaction from the pool's eviction heap:
|
|
// - If the entire account was dropped, pop off the address
|
|
// - Otherwise, if the new tail has better eviction caps, fix the heap
|
|
if last {
|
|
heap.Pop(p.evict)
|
|
} else {
|
|
tail := txs[len(txs)-1] // new tail, surely exists
|
|
|
|
evictionExecFeeDiff := tail.evictionExecFeeJumps - drop.evictionExecFeeJumps
|
|
evictionBlobFeeDiff := tail.evictionBlobFeeJumps - drop.evictionBlobFeeJumps
|
|
|
|
if evictionExecFeeDiff > 0.001 || evictionBlobFeeDiff > 0.001 { // no need for math.Abs, monotonic decreasing
|
|
heap.Fix(p.evict, 0)
|
|
}
|
|
}
|
|
// Remove the transaction from the data store
|
|
log.Debug("Evicting overflown blob transaction", "from", from, "evicted", drop.nonce, "id", drop.id)
|
|
dropOverflownMeter.Mark(1)
|
|
|
|
if err := p.store.Delete(drop.id); err != nil {
|
|
log.Error("Failed to drop evicted transaction", "id", drop.id, "err", err)
|
|
}
|
|
}
|
|
|
|
// Pending retrieves all currently processable transactions, grouped by origin
|
|
// account and sorted by nonce.
|
|
//
|
|
// The transactions can also be pre-filtered by the dynamic fee components to
|
|
// reduce allocations and load on downstream subsystems.
|
|
func (p *BlobPool) Pending(filter txpool.PendingFilter) map[common.Address][]*txpool.LazyTransaction {
|
|
// If only plain transactions are requested, this pool is unsuitable as it
|
|
// contains none, don't even bother.
|
|
if filter.OnlyPlainTxs {
|
|
return nil
|
|
}
|
|
// Track the amount of time waiting to retrieve the list of pending blob txs
|
|
// from the pool and the amount of time actually spent on assembling the data.
|
|
// The latter will be pretty much moot, but we've kept it to have symmetric
|
|
// across all user operations.
|
|
pendStart := time.Now()
|
|
p.lock.RLock()
|
|
pendwaitHist.Update(time.Since(pendStart).Nanoseconds())
|
|
defer p.lock.RUnlock()
|
|
|
|
execStart := time.Now()
|
|
defer func() {
|
|
pendtimeHist.Update(time.Since(execStart).Nanoseconds())
|
|
}()
|
|
|
|
pending := make(map[common.Address][]*txpool.LazyTransaction, len(p.index))
|
|
for addr, txs := range p.index {
|
|
lazies := make([]*txpool.LazyTransaction, 0, len(txs))
|
|
for _, tx := range txs {
|
|
// If transaction filtering was requested, discard badly priced ones
|
|
if filter.MinTip != nil && filter.BaseFee != nil {
|
|
if tx.execFeeCap.Lt(filter.BaseFee) {
|
|
break // basefee too low, cannot be included, discard rest of txs from the account
|
|
}
|
|
tip := new(uint256.Int).Sub(tx.execFeeCap, filter.BaseFee)
|
|
if tip.Gt(tx.execTipCap) {
|
|
tip = tx.execTipCap
|
|
}
|
|
if tip.Lt(filter.MinTip) {
|
|
break // allowed or remaining tip too low, cannot be included, discard rest of txs from the account
|
|
}
|
|
}
|
|
if filter.BlobFee != nil {
|
|
if tx.blobFeeCap.Lt(filter.BlobFee) {
|
|
break // blobfee too low, cannot be included, discard rest of txs from the account
|
|
}
|
|
}
|
|
// Transaction was accepted according to the filter, append to the pending list
|
|
lazies = append(lazies, &txpool.LazyTransaction{
|
|
Pool: p,
|
|
Hash: tx.hash,
|
|
Time: execStart, // TODO(karalabe): Maybe save these and use that?
|
|
GasFeeCap: tx.execFeeCap,
|
|
GasTipCap: tx.execTipCap,
|
|
Gas: tx.execGas,
|
|
BlobGas: tx.blobGas,
|
|
})
|
|
}
|
|
if len(lazies) > 0 {
|
|
pending[addr] = lazies
|
|
}
|
|
}
|
|
return pending
|
|
}
|
|
|
|
// updateStorageMetrics retrieves a bunch of stats from the data store and pushes
|
|
// them out as metrics.
|
|
func (p *BlobPool) updateStorageMetrics() {
|
|
stats := p.store.Infos()
|
|
|
|
var (
|
|
dataused uint64
|
|
datareal uint64
|
|
slotused uint64
|
|
|
|
oversizedDataused uint64
|
|
oversizedDatagaps uint64
|
|
oversizedSlotused uint64
|
|
oversizedSlotgaps uint64
|
|
)
|
|
for _, shelf := range stats.Shelves {
|
|
slotDataused := shelf.FilledSlots * uint64(shelf.SlotSize)
|
|
slotDatagaps := shelf.GappedSlots * uint64(shelf.SlotSize)
|
|
|
|
dataused += slotDataused
|
|
datareal += slotDataused + slotDatagaps
|
|
slotused += shelf.FilledSlots
|
|
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(shelfDatausedGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(slotDataused))
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(shelfDatagapsGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(slotDatagaps))
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(shelfSlotusedGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(shelf.FilledSlots))
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(shelfSlotgapsGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(shelf.GappedSlots))
|
|
|
|
maxBlobs := eip4844.LatestMaxBlobsPerBlock(p.chain.Config())
|
|
if shelf.SlotSize/blobSize > uint32(maxBlobs) {
|
|
oversizedDataused += slotDataused
|
|
oversizedDatagaps += slotDatagaps
|
|
oversizedSlotused += shelf.FilledSlots
|
|
oversizedSlotgaps += shelf.GappedSlots
|
|
}
|
|
}
|
|
datausedGauge.Update(int64(dataused))
|
|
datarealGauge.Update(int64(datareal))
|
|
slotusedGauge.Update(int64(slotused))
|
|
|
|
oversizedDatausedGauge.Update(int64(oversizedDataused))
|
|
oversizedDatagapsGauge.Update(int64(oversizedDatagaps))
|
|
oversizedSlotusedGauge.Update(int64(oversizedSlotused))
|
|
oversizedSlotgapsGauge.Update(int64(oversizedSlotgaps))
|
|
|
|
p.updateLimboMetrics()
|
|
}
|
|
|
|
// updateLimboMetrics retrieves a bunch of stats from the limbo store and pushes
|
|
// them out as metrics.
|
|
func (p *BlobPool) updateLimboMetrics() {
|
|
stats := p.limbo.store.Infos()
|
|
|
|
var (
|
|
dataused uint64
|
|
datareal uint64
|
|
slotused uint64
|
|
)
|
|
for _, shelf := range stats.Shelves {
|
|
slotDataused := shelf.FilledSlots * uint64(shelf.SlotSize)
|
|
slotDatagaps := shelf.GappedSlots * uint64(shelf.SlotSize)
|
|
|
|
dataused += slotDataused
|
|
datareal += slotDataused + slotDatagaps
|
|
slotused += shelf.FilledSlots
|
|
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(limboShelfDatausedGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(slotDataused))
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(limboShelfDatagapsGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(slotDatagaps))
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(limboShelfSlotusedGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(shelf.FilledSlots))
|
|
metrics.GetOrRegisterGauge(fmt.Sprintf(limboShelfSlotgapsGaugeName, shelf.SlotSize/blobSize), nil).Update(int64(shelf.GappedSlots))
|
|
}
|
|
limboDatausedGauge.Update(int64(dataused))
|
|
limboDatarealGauge.Update(int64(datareal))
|
|
limboSlotusedGauge.Update(int64(slotused))
|
|
}
|
|
|
|
// SubscribeTransactions registers a subscription for new transaction events,
|
|
// supporting feeding only newly seen or also resurrected transactions.
|
|
func (p *BlobPool) SubscribeTransactions(ch chan<- core.NewTxsEvent, reorgs bool) event.Subscription {
|
|
if reorgs {
|
|
return p.insertFeed.Subscribe(ch)
|
|
} else {
|
|
return p.discoverFeed.Subscribe(ch)
|
|
}
|
|
}
|
|
|
|
// Nonce returns the next nonce of an account, with all transactions executable
|
|
// by the pool already applied on top.
|
|
func (p *BlobPool) Nonce(addr common.Address) uint64 {
|
|
// We need a write lock here, since state.GetNonce might write the cache.
|
|
p.lock.Lock()
|
|
defer p.lock.Unlock()
|
|
|
|
if txs, ok := p.index[addr]; ok {
|
|
return txs[len(txs)-1].nonce + 1
|
|
}
|
|
return p.state.GetNonce(addr)
|
|
}
|
|
|
|
// Stats retrieves the current pool stats, namely the number of pending and the
|
|
// number of queued (non-executable) transactions.
|
|
func (p *BlobPool) Stats() (int, int) {
|
|
p.lock.RLock()
|
|
defer p.lock.RUnlock()
|
|
|
|
var pending int
|
|
for _, txs := range p.index {
|
|
pending += len(txs)
|
|
}
|
|
return pending, 0 // No non-executable txs in the blob pool
|
|
}
|
|
|
|
// Content retrieves the data content of the transaction pool, returning all the
|
|
// pending as well as queued transactions, grouped by account and sorted by nonce.
|
|
//
|
|
// For the blob pool, this method will return nothing for now.
|
|
// TODO(karalabe): Abstract out the returned metadata.
|
|
func (p *BlobPool) Content() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) {
|
|
return make(map[common.Address][]*types.Transaction), make(map[common.Address][]*types.Transaction)
|
|
}
|
|
|
|
// ContentFrom retrieves the data content of the transaction pool, returning the
|
|
// pending as well as queued transactions of this address, grouped by nonce.
|
|
//
|
|
// For the blob pool, this method will return nothing for now.
|
|
// TODO(karalabe): Abstract out the returned metadata.
|
|
func (p *BlobPool) ContentFrom(addr common.Address) ([]*types.Transaction, []*types.Transaction) {
|
|
return []*types.Transaction{}, []*types.Transaction{}
|
|
}
|
|
|
|
// Status returns the known status (unknown/pending/queued) of a transaction
|
|
// identified by their hashes.
|
|
func (p *BlobPool) Status(hash common.Hash) txpool.TxStatus {
|
|
if p.Has(hash) {
|
|
return txpool.TxStatusPending
|
|
}
|
|
return txpool.TxStatusUnknown
|
|
}
|
|
|
|
// Clear implements txpool.SubPool, removing all tracked transactions
|
|
// from the blob pool and persistent store.
|
|
func (p *BlobPool) Clear() {
|
|
p.lock.Lock()
|
|
defer p.lock.Unlock()
|
|
|
|
// manually iterating and deleting every entry is super sub-optimal
|
|
// However, Clear is not currently used in production so
|
|
// performance is not critical at the moment.
|
|
for hash := range p.lookup.txIndex {
|
|
id, _ := p.lookup.storeidOfTx(hash)
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Warn("failed to delete blob tx from backing store", "err", err)
|
|
}
|
|
}
|
|
for hash := range p.lookup.blobIndex {
|
|
id, _ := p.lookup.storeidOfBlob(hash)
|
|
if err := p.store.Delete(id); err != nil {
|
|
log.Warn("failed to delete blob from backing store", "err", err)
|
|
}
|
|
}
|
|
|
|
// unreserve each tracked account. Ideally, we could just clear the
|
|
// reservation map in the parent txpool context. However, if we clear in
|
|
// parent context, to avoid exposing the subpool lock, we have to lock the
|
|
// reservations and then lock each subpool.
|
|
//
|
|
// This creates the potential for a deadlock situation:
|
|
//
|
|
// * TxPool.Clear locks the reservations
|
|
// * a new transaction is received which locks the subpool mutex
|
|
// * TxPool.Clear attempts to lock subpool mutex
|
|
//
|
|
// The transaction addition may attempt to reserve the sender addr which
|
|
// can't happen until Clear releases the reservation lock. Clear cannot
|
|
// acquire the subpool lock until the transaction addition is completed.
|
|
for acct := range p.index {
|
|
p.reserve(acct, false)
|
|
}
|
|
p.lookup = newLookup()
|
|
p.index = make(map[common.Address][]*blobTxMeta)
|
|
p.spent = make(map[common.Address]*uint256.Int)
|
|
|
|
var (
|
|
basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), p.head))
|
|
blobfee = uint256.NewInt(params.BlobTxMinBlobGasprice)
|
|
)
|
|
p.evict = newPriceHeap(basefee, blobfee, p.index)
|
|
}
|