mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-29 08:03:48 +00:00
* params: release Geth v1.14.5 * params: begin v1.14.6 release cycle * cmd/evm/internal/t8ntool: remove unused parameter (#29930) * go.mod : tidy * cmd/clef, cmd/evm: fix markdown issues in README (#29954) * cmd/geth: remove unused param (#29952) * p2p/discover: add missing lock when calling tab.handleAddNode (#29960) * p2p: use package slices to sort in PeersInfo (#29957) * core: initialize developer genesis beacon root contract with 0 balance (#29963) * core, rlp: remove duplicated words (#29964) * cmd, core: prefetch reads too from tries if requested (#29807) * cmd/utils, consensus/beacon, core/state: when configured via stub flag: prefetch all reads from account/storage tries, terminate prefetcher synchronously. * cmd, core/state: fix nil panic, fix error handling, prefetch nosnap too * core/state: expand prefetcher metrics for reads and writes separately * cmd/utils, eth: fix noop collect witness flag --------- Co-authored-by: Péter Szilágyi <peterke@gmail.com> * core/state: rename all the AccessList receivers to 'al' (#29921) rename all the receivers to 'al' * ethconfig: regenerate config (#29970) * cmd/devp2p: fix log output (#29972) * .github: disable cache in actions run (#29926) * p2p/simulations: update doc of HTTP endpoints (#29894) * all: fix inconsistent receiver name and add lint rule for it (#29974) * .golangci.yml: enable check for consistent receiver name * beacon/light/sync: fix receiver name * core/txpool/blobpool: fix receiver name * core/types: fix receiver name * internal/ethapi: use consistent receiver name 'api' for handler object * signer/core/apitypes: fix receiver name * signer/core: use consistent receiver name 'api' for handler object * log: fix receiver name * accounts: avoid duplicate regex compilation (#29943) * fix: Optimize regular initialization * modify var name * variable change to private types * core/state, eth/protocols, trie, triedb/pathdb: remove unused error from trie Commit (#29869) * core/state, eth/protocols, trie, triedb/pathdb: remove unused error return from trie Commit * move set back to account-trie-update block scoping for easier readability * address review * undo tests submodule change * trie: panic if BatchSerialize returns an error in Verkle trie Commit * trie: verkle comment nitpicks --------- Co-authored-by: Péter Szilágyi <peterke@gmail.com> * beacon/light: fix shutdown issues (#29946) * beacon/light/request: add server test for event after unsubscribe * beacon/light/api: fixed double stream.Close() * beacon/light/request: add checks for nil event callback function * beacon/light/request: unlock server mutex while unsubscribing from parent * trie/triedb: add Reader to backend interface (#29988) * core/state/snapshot: add a missing lock (#30001) * upgrade lock usage * revert unnecessary change * go.mod: update Pebble to sort out a deleted upstream dependency (#30010) * log: fix some functions comments (#29907) updates some docstrings --------- Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * trie, triedb/pathdb: prealloc capacity for map and slice (#29986) * triedb/pathdb: use maps.Clone and maps.Keys (#29985) * common/math: fix out of bounds access in json unmarshalling (#30014) Co-authored-by: Martin Holst Swende <martin@swende.se> * core/state/snapshot: acquire the lock on Release (#30011) * core/state/snapshot: acquire the lock on release * core/state/snapshot: only acquire read-lock when iterating * cmd/geth, ethdb/pebble: improve database statistic (#29948) * cmd/geth, ethdb/pebble: polish method naming and code comment * implement db stat for pebble * cmd, core, ethdb, internal, trie: remove db property selector * cmd, core, ethdb: fix function description --------- Co-authored-by: prpeh <prpeh@proton.me> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * trie: don't reset tracer at the end of Commit (#30024) * trie: don't reset tracer at the end of Commit * Update trie.go --------- Co-authored-by: rjl493456442 <garyrong0905@gmail.com> * common: using `ParseUint` instead of `ParseInt` (#30020) Since Decimal is defined as unsiged `uint64`, we should use `strconv.ParseUint` instead of `strconv.ParseInt` during unmarshalling. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * core/txpool/blobpool: change rw-lock to r-lock (#29989) * trie/trienode: avoid unnecessary copy (#30019) * avoid unnecessary copy * delete the never used function ProofList * eth/protocols/snap, trie/trienode: polish the code --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * p2p/rlpx: 2KB maximum size for handshake messages (#30029) Co-authored-by: Felix Lange <fjl@twurst.com> * core/state/snapshot: tiny fixes (#29995) * Revert "core/state/snapshot: tiny fixes" (#30039) Revert "core/state/snapshot: tiny fixes (#29995)" This reverts commite0e45dbc32. * p2p/discover: improve flaky revalidation tests (#30023) * cmd/blsync: use debug.Setup for logging configuration (#30065) * .github: add lightclient as codeowner to relevant packages (#30062) * accounts/keystore: use t.TempDir in test (#30052) * internal/debug: remove unnecessary log level assignment (#30044) Log level is specified in L259 so it's unnecessary to specify it for handlers (L234, L236). * all: stateless witness builder and (self-)cross validator (#29719) * all: add stateless verifications * all: simplify witness and integrate it into live geth --------- Co-authored-by: Péter Szilágyi <peterke@gmail.com> * core/txpool/blobpool: avoid use *map as parameter. (#30048) * trie/trienode: remove unnecessary check in Summary (#30047) * eth/tracers,trie: remove unnecessary check (#30071) * trie: relocate state execution logic into pathdb package (#29861) * triedb/pathdb: fix flaky test in pathdb (#29901) * core/txpool/blobpool: improve newPriceHeap function (#30050) Co-authored-by: Felix Lange <fjl@twurst.com> * cmd/evm/internal/t8ntool: log writeTraceResult error message (#30038) * all: replace division with right shift if possible (#29911) * rpc: truncate call error data logs (#30028) Co-authored-by: Felix Lange <fjl@twurst.com> * accounts/usbwallet/trezor: upgrade to generate with protoc 27.1 (#30058) * build: add check for stale generated files (#30037) Co-authored-by: Felix Lange <fjl@twurst.com> * core/state: fix inconsistent verkle test error messages (#29753) * accounts/abi: embed Go template instead of string literal (#30098) refactor(accounts/abi): use embed pkg to split default template to file * params: release Geth v1.14.6 * params: begin v1.14.7 release cycle * params: release Geth v1.14.6 * build: upgrade -dlgo version to Go 1.22.5 (#30112) * crypto: remove hardcoded value for secp256k1.N (#30126) * go.mod: update uint256 to 1.3.0 (#30134) * eth/catalyst: fix params in failure log (#30131) * core/txpool/blobpool: revert #29989, WLock on Nonce (#30142) * params: go-ethereum v1.14.7 stable * params: begin v1.14.8 release cycle * core/state: fix prefetcher for verkle (#29760) * core/txpool/blobpool: use nonce from argument instead of tx.Nonce() (#30148) This does not change the behavior here as the nonce in the argument is tx.Nonce(). This commit helps to make the function easier to read and avoid capturing the tx in the function. * trie: add RollBackAccount function to verkle trees (#30135) * p2p: fix ip change log parameter (#30158) * cmd/utils: fix typo in flag description (#30127) * core/types: don't modify signature V when reading large chainID (#30157) * SECURITY.md: correct PGP key block formatting (#30123) * all: simplify tests using t.TempDir() (#30150) * eth/catalyst: fix (*SimulatedBeacon).AdjustTime() conversion (#30138) * trie, triedb: remove unnecessary child resolver interface (#30167) * core/txpool/legacypool: use maps.Keys and maps.Copy (#30091) * core/state: don't compute verkle storage tree roots (#30130) * core/rawdb, triedb, cmd: create an isolated disk namespace for verkle (#30105) * core, triedb/pathdb, cmd: define verkle state ancient store * core/rawdb, triedb: add verkle namespace in pathdb * p2p/discover: remove type encPubkey (#30172) The pubkey type was moved to package v4wire a long time ago. Remaining uses of encPubkey were probably left in due to laziness. * go.mod: upgrade to btcsuite/btcd/btcec v2.3.4 (#30181) * ethdb: remove snapshot (#30189) * eth/gasprice: remove default from config (#30080) * eth/gasprice: remove default from config * eth/gasprice: sanitize startPrice * rpc: use stable object in notifier test (#30193) This makes the test resilient to changes of types.Header -- otherwise the test needs to be updated each time the header structure is modified. * core/state: remove useless metrics (#30184) Originally, these metrics were added to track the largest storage wiping. Since account self-destruction was deprecated with the Cancun fork, these metrics have become meaningless. * rpc: show more error detail for `invalidMessageError` (#30191) Here we add distinct error messages for network timeouts and JSON parsing errors. Note this specifically applies to HTTP connections serving a single RPC request. Co-authored-by: Felix Lange <fjl@twurst.com> * core/tracing: update latest release version (#30211) * core/txpool: use the cached address in ValidateTransactionWithState (#30208) The address recover is executed and cached in ValidateTransaction already. It's expected that the cached one is returned in ValidateTransaction. However, currently, we use the wrong function signer.Sender instead of types.Sender which will do all the address recover again. * core/state: check db error after intermediate call (#30171) This pull request adds an additional error check after statedb.IntermediateRoot, ensuring that no errors occur during this call. This step is essential, as the call might encounter database errors. * cmd/utils: allow configurating blob pool from flags (#30203) Currently, we have 3 flags to configure blob pool. However, we don't read these flags and set the blob pool configuration in eth config accordingly. This commit adds a function to check if these flags are provided and set blob pool configuration based on them. * core/state: fix SetStorage override behavior (#30185) This pull request fixes the broken feature where the entire storage set is overridden. Originally, the storage set override was achieved by marking the associated account as deleted, preventing access to the storage slot on disk. However, since #29520, this flag is also checked when accessing the account, rendering the account unreachable. A fix has been applied in this pull request, which re-creates a new state object with all account metadata inherited. * triedb/pathdb: print out all trie owner and hash information (#30200) This pull request explicitly prints out the full hash for debugging purpose. * beacon/types, cmd/devp2p, p2p/enr: clean up uses of fmt.Errorf (#30182) * eth/tracers, internal/ethapi: remove unnecessary map pointer in state override (#30094) * internal/ethapi: fix state override test (#30228) Looks like #30094 became a bit stale after #30185 was merged and now we have a stale ref to a state override object causing CI to fail on master. * p2p/nat: return correct port for ExtIP NAT (#30234) Return the actually requested external port instead of 0 in the AddMapping implementation for `--nat extip:<IP>`. * p2p: fix flaky test TestServerPortMapping (#30241) The test specifies `ListenAddr: ":0"`, which means a random ephemeral port will be chosen for the TCP listener by the OS. Additionally, since no `DiscAddr` was specified, the same port that is chosen automatically by the OS will also be used for the UDP listener in the discovery UDP setup. This sometimes leads to test failures if the TCP listener picks a free TCP port that is already taken for UDP. By specifying `DiscAddr: ":0"`, the UDP port will be chosen independently from the TCP port, fixing the random failure. See issue #29830. Verified using ``` cd p2p go test -c -race stress ./p2p.test -test.run=TestServerPortMapping ... 5m0s: 4556 runs so far, 0 failures ``` The issue described above can technically lead to sporadic failures on systems that specify a listen address via the `--port` flag of 0 while not setting `--discovery.port`. Since the default is using port `30303` and using a random ephemeral port is likely not used much to begin with, not addressing the root cause might be acceptable. * p2p/discover: schedule revalidation also when all nodes are excluded (#30239) ## Issue If `nextTime` has passed, but all nodes are excluded, `get` would return `nil` and `run` would therefore not invoke `schedule`. Then, we schedule a timer for the past, as neither `nextTime` value has been updated. This creates a busy loop, as the timer immediately returns. ## Fix With this PR, revalidation will be also rescheduled when all nodes are excluded. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * miner: remove outdated comment (#30248) * eth/downloader: correct sync mode logging to show old mode (#30219) This PR fixes an issue in the setMode method of beaconBackfiller where the log message was not displaying the previous mode correctly. The log message now shows both the old and new sync modes. * all: remove deprecated protobuf dependencies (#30232) The package `github.com/golang/protobuf/proto` is deprecated in favor `google.golang.org/protobuf/proto`. We should update the codes to recommended package. Signed-off-by: Icarus Wu <icaruswu66@qq.com> * accounts/abi/bind: add accessList support to base bond contract (#30195) Adding the correct accessList parameter when calling a contract can reduce gas consumption. However, the current version only allows adding the accessList manually when constructing the transaction. This PR can provide convenience for saving gas. * internal/debug: remove memsize (#30253) Removing because memsize will very likely be broken by Go 1.23. See https://github.com/fjl/memsize/issues/4 * eth/downloader: gofmt (#30261) Fixes a regression introduced in https://github.com/ethereum/go-ethereum/pull/30219 * cmd/evm: don't overwrite sender account (#30259) Fixes #30254 It seems like the removed CreateAccount call is very old and not needed anymore. After removing it, setting a sender that does not exist in the state doesn't seem to cause an issue. * eth/catalyst: get params.ExcessBlobGas but check with params.BlobGasUsed (#30267) Seems it is checked with the wrong argument Signed-off-by: jsvisa <delweng@gmail.com> * params: remove unused les parameters (#30268) * core/vm/runtime: ensure tracer benchmark calls `OnTxStart` (#30257) The struct-based tracing added in #29189 seems to have caused an issue with the benchmark `BenchmarkTracerStepVsCallFrame`. On master we see the following panic: ```console BenchmarkTracerStepVsCallFrame panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x2 addr=0x40 pc=0x1019782f0] goroutine 37 [running]: github.com/ethereum/go-ethereum/eth/tracers/js.(*jsTracer).OnOpcode(0x140004c4000, 0x0, 0x10?, 0x989680, 0x1, {0x101ea2298, 0x1400000e258}, {0x1400000e258?, 0x14000155928?, 0x10173020c?}, ...) /Users/matt/dev/go-ethereum/eth/tracers/js/goja.go:328 +0x140 github.com/ethereum/go-ethereum/core/vm.(*EVMInterpreter).Run(0x14000307da0, 0x140003cc0d0, {0x0, 0x0, 0x0}, 0x0) ... FAIL github.com/ethereum/go-ethereum/core/vm/runtime 0.420s FAIL ``` The issue seems to be that `OnOpcode` expects that `OnTxStart` has already been called to initialize the `env` value in the tracer. The JS tracer uses it in `OnOpcode` for the `GetRefund()` method. This patch resolves the issue by reusing the `Call` method already defined in `runtime_test.go` which correctly calls `OnTxStart`. * ethclient: support networkID in hex format (#30263) Some chains’ network IDs use hexadecimal such as Optimism ("0xa" instead of "10"), so when converting the string to big.Int, we cannot specify base 10; otherwise, it will encounter errors with hexadecimal network IDs. * core/vm: improved stack swap performance (#30249) This PR adds the methods `Stack.swap1..16()` that faster than `Stack.swap(1..16)`. Co-authored-by: lmittmann <lmittmann@users.noreply.github.com> * signer/core: improve performance of isPrimitiveTypeValid function (#30274) (#30277) Precomputes valid primitive types into a map to use for validation, thus removing sprintf. * core/vm: use uint64 in memory for indices everywhere (#30252) Consistently use `uint64` for indices in `Memory` and drop lots of type conversions from `uint64` to `int64`. --------- Co-authored-by: lmittmann <lmittmann@users.noreply.github.com> * build: upgrade -dlgo version to Go 1.22.6 (#30273) * tests: fix TransactionTest to actually run (#30272) Due to https://github.com/ethereum/tests/releases/tag/v10.1, the format of the TransactionTest changed, but it was not properly addressed, causing the test to pass unexpectedly. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/downloader, core/types: take withdrawals-size into account in downloader queue (#30276) Fixes a slight miscalculation in the downloader queue, which was not accurately taking block withdrawals into account when calculating the size of the items in the queue * cmd/evm: fix evm basefee (#30281) fixes #30279 -- previously we did not use the basefee from the genesis, and instead the defaults were used from `runtime.go/setDefaults`-function * go.mod: update uint256 to 1.3.1 (#30280) Release notes: https://github.com/holiman/uint256/releases/tag/v1.3.1 * beacon/engine, consensus/beacon: use params.MaximumExtraDataSize instead of hard-coded value (#29721) Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: lightclient <lightclient@protonmail.com> * p2p/simulations: remove packages (#30250) Looking at the history of these packages over the past several years, there haven't been any meaningful contributions or usages: https://github.com/ethereum/go-ethereum/commits/master/p2p/simulations?before=de6d5976794a9ed3b626d4eba57bf7f0806fb970+35 Almost all of the commits are part of larger refactors or low-hanging-fruit contributions. Seems like it's not providing much value and taking up team + contributor time. * eth/protocols/snap: cleanup dangling account trie nodes due to incomplete storage (#30258) This pull request fixes #30229. During snap sync, large storage will be split into several pieces and synchronized concurrently. Unfortunately, the tradeoff is that the respective merkle trie of each storage chunk will be incomplete due to the incomplete boundaries. The trie nodes on these boundaries will be discarded, and any dangling nodes on disk will also be removed if they fall on these paths, ensuring the state healer won't be blocked. However, the dangling account trie nodes on the path from the root to the associated account are left untouched. This means the dangling account trie nodes could potentially stop the state healing and break the assumption that the entire subtrie should exist if the subtrie root exists. We should consider the account trie node as the ancestor of the corresponding storage trie node. In the scenarios described in the above ticket, the state corruption could occur if there is a dangling account trie node while some storage trie nodes are removed due to synchronization redo. The fixing idea is pretty straightforward, the trie nodes on the path from root to account should all be explicitly removed if an incomplete storage trie occurs. Therefore, a `delete` operation has been added into `gentrie` to explicitly clear the account along with all nodes on this path. The special thing is that it's a cross-trie clearing. In theory, there may be a dangling node at any position on this account key and we have to clear all of them. * params: release go-ethereum v1.14.8 stable * params: begin v1.14.9 release cycle * go.mod: remove github.com/julienschmidt/httprouter (#30290) * build: run 'go mod tidy' check as part of lint (#30291) * core/txpool/blobpool: fix error message (#30247) the validation process only checks for 'less than', which is inconsistent with the error output * go.mod: upgrade to pebble v1.1.2 (#30297) Includes a fix for MIPS32 support. Pebble release: https://github.com/cockroachdb/pebble/releases/tag/v1.1.2 Key fix for mips32:9f3904a705(also the only change from v1.1.1. * core: only compute state root once (#30299) This PR refactors the genesis initialization a bit, s.th. we only compute the blockhash once instead of twice as before (during hashAlloc and flushAlloc) This will significantly reduce the amount of memory allocated during genesis init --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * .golangci.yml: remove lint warning for TxLookupLimit * eth/fetcher: always expect transaction metadata in announcement (#30288) This pull request drops the legacy transaction retrieval support from before eth68, adding the restrictions that transaction metadata must be provided along with the transaction announment. * eth/ethconfig: remove LES server config (#30298) * eth/tracers/js: add coinbase addr to ctx (#30231) Add coinbase address to javascript tracer context. This PR adds the `coinbase` address to `jsTracer.ctx`, allowing access to the coinbase address (fee receipient) in custom JavaScript tracers. Example usage: ```javascript result: function(ctx) { return toAddress(ctx.coinbase); } ``` This change enables custom tracers to access coinbase address, previously unavailable, enhancing their capabilities to match built-in tracers. * eth: dial nodes from discv5 (#30302) Here I am adding a discv5 nodes source into the p2p dial iterator. It's an improved version of #29533. Unlike discv4, the discv5 random nodes iterator will always provide full ENRs. This means we can apply filtering to the results and will only try dialing nodes which explictly opt into the eth protocol with a matching chain. I have also removed the dial iterator from snap. We don't have an official DNS list for snap anymore, and I doubt anyone else is running one. While we could potentially filter for snap on discv5, there will be very few nodes announcing it, and the extra iterator would just stall the dialer. --------- Co-authored-by: lightclient <lightclient@protonmail.com> * beacon/light: handle endpoint URL more gracefully (#30306) blsync was failing if the light endpoint it was provided ended with a `/`. This change should handle the joining more gracefully. * core: remove withdrawal length check for state processor (#30286) The withdrawal length is already verified by the beacon consensus package, so the check in the state processor is a duplicate. * vm: simplify error handling in `vm.EVM.create()` (#30292) To allow all error paths in `vm.EVM.create()` to consume the necessary gas, there is currently a pattern of gating code on `if err == nil` instead of returning as soon as the error occurs. The same behaviour can be achieved by abstracting the gated code into a method that returns immediately on error, improving readability and thus making it easier to understand and maintain. * internal/build: include git-date on detached head (#30320) When we are building in detached head, we cannot easily obtain the same information as we can if we're in non-detached head. However, one thing we _can_ obtain is the git-hash and git-date. Currently, we omit to include the git-date into the build-info, which causes problem for reproducable builds which are on a detached head. This change fixes it to include the date-info always. * build: remove mantic from ppa builds (#30322) removes ppa-build for ubuntu `mantic` * gitignore: ignore upload-artefacts (#30325) Our `WriteArchive`, used by ci builder, creates files in the repo root,in order to upload. After we've built the amd64-builds, we create the uploads, and cause the repo to be flagged as dirty for the remaining builds. This change fixes it by adding the artefacts to gitignore. Closes #30324 * eth/catalyst: ensure period zero mode leaves no pending txs in pool (#30264) closes #29475, replaces #29657, #30104 Fixes two issues. First is a deadlock where the txpool attempts to reorg, but can't complete because there are no readers left for the new txs subscription. Second, resolves a problem with on demand mode where txs may be left pending when there are more pending txs than block space. Co-authored-by: Martin Holst Swende <martin@swende.se> * accounts/abi: handle ABIs with contract type parameter (#30315) convert parameter of type contract to the basic `address` type --------- Co-authored-by: Martin HS <martin@swende.se> * core/rawdb: drop MigrateTable (#30331) These are the leftovers from #24028. * core/vm: reuse Memory instances (#30137) This PR adds a sync.Pool to reuse instances of Memory in EVMInterpreter. * build: attempt at reproducible builds (#30321) This PR implements the conclusions from https://github.com/ethereum/go-ethereum/issues/28987#issuecomment-2296075028, that is: Building with `--strip-all` as a ld-flag to the cgo linker, to remove symbols. Without that, some spurious reference to a temporary file is included into the kzg-related library. Building with `--build-id=none`, to avoid putting a `build id` into the file. * all: update to go version 1.23.0 (#30323) This PR updates the version of go used in builds and docker to 1.23.0. Release notes: https://go.dev/doc/go1.23 More importantly, following our policy of maintaining the last two versions (which now becomes 1.23 and 1.22), we can now make use of the things that were introduced in 1.22: https://go.dev/doc/go1.22 Go 1.22 makes two changes to “for” loops. - each iteration creates new variables, - for loops may range over integers Other than that, some interesting library changes and other stuff. * rpc: add timeout to rpc client Unsubscribe (#30318) Fixes #30156 This adds a repro of the linked issue. I fixed it by adding a timeout when issuing the call to unsubscribe. * cmd/devp2p: require dns:read, dns:edit permissions for cloudflare deploy (#30326) This PR adds the `dns:read` and `dns:edit` permissions to the required set of permissions checked before deploying an ENR tree to Cloudflare. These permissions are necessary for a successful publish. **Background**: The current logic for `devp2p dns to-cloudflare` checks for `zone:edit` and `zone:read` permissions. However, when running the command with only these two permissions, the following error occurs: ``` wrong permissions on zone REMOVED-ZONE: map[#zone:edit:false #zone:read:true] ``` Adding `zone:read` and `zone:edit` to the API token led to a different error: ``` INFO [08-19|14:06:16.782] Retrieving existing TXT records on pos-nodes.hardfork.dev Authentication error (10000) ``` This suggested that additional permissions were required. I added `dns:read`, but encountered another error: ``` INFO [08-19|14:11:42.342] Retrieving existing TXT records on pos-nodes.hardfork.dev INFO [08-19|14:11:42.851] Updating DNS entries failed to publish REMOVED.pos-nodes.hardfork.dev: Authentication error (10000) ``` Finally, after adding both `dns:read` and `dns:edit` permissions, the command executed successfully with the following output: ``` INFO [08-19|14:13:07.677] Checking Permissions on zone REMOVED-ZONE INFO [08-19|14:13:08.014] Retrieving existing TXT records on pos-nodes.hardfork.dev INFO [08-19|14:13:08.440] Updating DNS entries INFO [08-19|14:13:08.440] "Updating pos-nodes.hardfork.dev from \"enrtree-root:v1 e=FSED3EDKEKRDDFMCLP746QY6CY l=FDXN3SN67NA5DKA4J2GOK7BVQI seq=1 sig=Glja2c9RviRqOpaaHR0MnHsQwU76nJXadJwFeiXpp8MRTVIhvL0LIireT0yE3ETZArGEmY5Ywz3FVHZ3LR5JTAE\" to \"enrtree-root:v1 e=AB66M4ULYD5OYN4XFFCPVZRLUM l=FDXN3SN67NA5DKA4J2GOK7BVQI seq=1 sig=H8cqDzu0FAzBplK4g3yudhSaNtszIebc2aj4oDm5a5ZE5PAg-xpCnQgVE_53CsgsqQpalD9byafx_FrUT61sagA\"" INFO [08-19|14:13:16.932] Updated DNS entries new=32 updated=1 untouched=100 INFO [08-19|14:13:16.932] Deleting stale DNS entries INFO [08-19|14:13:24.663] Deleted stale DNS entries count=31 ``` With this PR, the required permissions for deploying an ENR tree to Cloudflare now include `zone:read`, `zone:edit`, `dns:read`, and `dns:edit`. The initial check now includes all of the necessary permissions and indicates in the error message which permissions are missing: ``` INFO [08-19|14:17:20.339] Checking Permissions on zone REMOVED-ZONE wrong permissions on zone REMOVED-ZONE: map[#dns_records:edit:false #dns_records:read:false #zone:edit:false #zone:read:true] ``` * all: clean up goerli flag and config (#30289) Co-authored-by: lightclient <lightclient@protonmail.com> * cmd/utils,p2p: enable discv5 by default (#30327) * travis.yml: use focal for builds (#30319) * trie: use go-verkle helper for speedier (*VerkleTrie).RollBackAccount (#30242) This is a performance improvement on the account-creation rollback code required for the archive node to support verkle. It uses the utility function `DeleteAtStem` to remove code and account data per-group instead of doing it leaf by leaf. It also fixes an index bug, as code is chunked in 31-byte chunks, so comparing with the code size should use 31 as its stride. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * eth/protocols/eth: handle zero-count header requests (#30305) Proper fix for handling `count=0` get header requests. https://en.wikipedia.org/wiki/Count_Zero * eth/tracers: avoid panic in state test runner (#30332) Make tracers more robust by handling `nil` receipt as input. Also pass in a receipt with gas used in the state test runner. Closes https://github.com/ethereum/go-ethereum/issues/30117. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * build: fix hash for go1.23.0.linux-riscv64.tar.gz (#30335) build: fix hash for go1.23.0.linux-riscv64.tar.gz * build: make go buildid static (#30342) The previous clearing of buildid did fully work, turns out we need to set it in `ldflags` The go buildid is the only remaining hurdle for reproducible builds, see https://github.com/ethereum/go-ethereum/issues/28987#issuecomment-2306412590 This PR changes the go build id application note to say literally `none` https://github.com/golang/go/issues/33772#issuecomment-528176001: > This difference is due to the .note.go.buildid section added by the linker. It can be set to something static e.g. -ldflags=-buildid= (empty string) to gain reproducibility. * trie: avoid un-needed map copy (#30343) This change avoids the an unnecessary map copy if the preimage recording is not enabled. * beacon/blsync: better error information in test (#30336) this change reports the error instead of ignoring it * beacon/light/sync: basic tests for rangeLock (#30269) adds simple tests for lock and firstUnlocked method from rangeLock type --------- Co-authored-by: lightclient <lightclient@protonmail.com> * build: debug travis build (#30344) debugging travis build pipeline * gitignore: ignore build signatures (#30346) Ignore files are generated during signing of download-binaries, which 'dirty' the vcs for subsequent builds. * doc: update 2021-08-22-split-postmortem (#30351) Update 2021-08-22-split-postmortem * core: implement EIP-2935 (#29465) https://eips.ethereum.org/EIPS/eip-2935 --------- Co-authored-by: Guillaume Ballet <gballet@gmail.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> Co-authored-by: Martin HS <martin@swende.se> * core: add metrics for state access (#30353) This pull request adds a few more performance metrics, specifically: - The average time cost of an account read - The average time cost of a storage read - The rate of account reads - The rate of storage reads * core/state: fix trie prefetcher for verkle (#30354) This pull request fixes the panic issue in prefetcher once the verkle is activated. * p2p/discover: fix Write method in metered connection (#30355) `WriteToUDP` was never called, since `meteredUdpConn` exposed directly all the methods from the underlying `UDPConn` interface. This fixes the `discover/egress` metric never being updated. * accounts/abi/bind, ethclient/simulated: check SendTransaction error in tests (#30349) In few tests the returned error from `SendTransaction` is not being checked. This PR checks the returned err in tests. Returning errors also revealed tx in `TestCommitReturnValue` is not actually being sent, and returns err ` only replay-protected (EIP-155) transactions allowed over RPC`. Fixed the transaction by using the `testTx` function. * core/state: semantic journalling (part 1) (#28880) This is a follow-up to #29520, and a preparatory PR to a more thorough change in the journalling system. ### API methods instead of `append` operations This PR hides the journal-implementation details away, so that the statedb invokes methods like `JournalCreate`, instead of explicitly appending journal-events in a list. This means that it's up to the journal whether to implement it as a sequence of events or aggregate/merge events. ### Snapshot-management inside the journal This PR also makes it so that management of valid snapshots is moved inside the journal, exposed via the methods `Snapshot() int` and `RevertToSnapshot(revid int, s *StateDB)`. ### SetCode JournalSetCode journals the setting of code: it is implicit that the previous values were "no code" and emptyCodeHash. Therefore, we can simplify the setCode journal. ### Selfdestruct The self-destruct journalling is a bit strange: we allow the selfdestruct operation to be journalled several times. This makes it so that we also are forced to store whether the account was already destructed. What we can do instead, is to only journal the first destruction, and after that only journal balance-changes, but not journal the selfdestruct itself. This simplifies the journalling, so that internals about state management does not leak into the journal-API. ### Preimages Preimages were, for some reason, integrated into the journal management, despite not being a consensus-critical data structure. This PR undoes that. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * signer/core/apitypes: support fixed size arrays for EIP-712 typed data (#30175) When attempting to hash a typed data struct that includes a type reference with a fixed-size array, the validation process fails. According to EIP-712, arrays can be either fixed-size or dynamic, denoted by `Type[n]` or `Type[]` respectively, although it appears this currently isn't supported. This change modifies the validation logic to accommodate types containing fixed-size arrays. * consensus/beacon, core/types: add verkle witness builder (#30129) This PR adds the bulk verkle witness+proof production at the end of block production. It reads all data from the tree in one swoop and produces a verkle proof. Co-authored-by: Felix Lange <fjl@twurst.com> * trie, core/state: Nyota EIP-6800 & EIP-4762 spec updates (#30357) This PR implements changes related to [EIP-6800](https://eips.ethereum.org/EIPS/eip-6800) and [EIP-4762](https://eips.ethereum.org/EIPS/eip-4762) spec updates. A TL;DR of the changes is that `Version`, `Balance`, `Nonce` and `CodeSize` are encoded in a single leaf named `BasicData`. For more details, see the [_Header Values_ table in EIP-6800](https://eips.ethereum.org/EIPS/eip-6800#header-values). The motivation for this was simplifying access event patterns, reducing code complexity, and, as a side effect, saving gas since fewer leaf nodes must be accessed. --------- Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Felix Lange <fjl@twurst.com> * Include tracerConfig in created tracing test (#30364) Fixes the tracer test filler for when there is tracerConfig. * core/state: pull the verkle trie from prefetcher for empty storage root (#30369) This pull request fixes a flaw in prefetcher. In verkle tree world, both accounts and storage slots are committed into a single tree instance for state hashing. If the prefetcher is activated, we will try to pull the trie for the prefetcher for performance speedup. However, we had a special logic to skip pulling storage trie if the storage root is empty. While it's true for merkle as we have nothing to do with an empty storage trie, it's totally wrong for verkle. The consequences for skipping pulling is the storage changes are committed into trie A, while the account changes are committed into trie B (pulled from the prefetcher), boom. * funding.json: add funding information file (#30385) Adds a list of funding identifiers. * all: implement EIP-6110, execution layer triggered deposits (#29431) This PR implements EIP-6110: Supply validator deposits on chain. It also sketches out the base for Prague in the engine API types. * all: remove forkchoicer and reorgNeeded (#29179) This PR changes how sidechains are handled. Before the merge, it was possible to import a chain with lower td and not set it as canonical. After the merge, we expect every chain that we get via InsertChain to be canonical. Non-canonical blocks can still be inserted with InsertBlockWIthoutSetHead. If during the InsertChain, the existing chain is not canonical anymore, we mark it as a sidechain and send the SideChainEvents normally. * core: fix compilation error (#30394) un-borks a compilation error from a recent merge to master * all: remove funding verifier (#30391) Now that verification is done, we can remove the funding information. * node: fix flaky jwt-test (#30388) This PR fixes a flaky jwt-test. The test is a jwt "from one second in the future". The test passes; the reason for this is that the CI-system is slow, and by the time the jwt is actually evaluated, that second has passed, and it's no longer future. Alternative to #30380 * build: increase go test timeout (#30398) This increases the timeout for the go tests on ci, this should prevent travis from erroring. see: https://app.travis-ci.com/github/ethereum/go-ethereum/jobs/625803693 * core/state: state reader abstraction (#29761) This pull request introduces a state.Reader interface for state accessing. The interface could be implemented in various ways. It can be pure trie only reader, or the combination of trie and state snapshot. What's more, this interface allows us to have more flexibility in the future, e.g. the archive reader (for accessing archive state). Additionally, this pull request removes the following metrics - `chain/snapshot/account/reads` - `chain/snapshot/storage/reads` * core/state: get rid of field pointer in journal (#30361) This pull request replaces the field pointer in journal entry with the field itself, specifically the address of mutated account. While it will introduce the extra allocation cost, but it's easier for code reading. Let's measure the overhead overall to see if the change is acceptable or not. * build: upgrade -dlgo version to Go 1.23.1 (#30404) New security fix: https://groups.google.com/g/golang-announce/c/K-cEzDeCtpc * internal/ethapi: eth_multicall (#27720) This is a successor PR to #25743. This PR is based on a new iteration of the spec: https://github.com/ethereum/execution-apis/pull/484. `eth_multicall` takes in a list of blocks, each optionally overriding fields like number, timestamp, etc. of a base block. Each block can include calls. At each block users can override the state. There are extra features, such as: - Include ether transfers as part of the logs - Overriding precompile codes with evm bytecode - Redirecting accounts to another address ## Breaking changes This PR includes the following breaking changes: - Block override fields of eth_call and debug_traceCall have had the following fields renamed - `coinbase` -> `feeRecipient` - `random` -> `prevRandao` - `baseFee` -> `baseFeePerGas` --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/fetcher: fix blob transaction propagation (#30125) This PR fixes an issue with blob transaction propagation due to the blob transation txpool rejecting transactions with gapped nonces. The specific changes are: - fetch transactions from a peer in the order they were announced to minimize nonce-gaps (which cause blob txs to be rejected - don't wait on fetching blob transactions after announcement is received, since they are not broadcast Testing: - unit tests updated to reflect that fetch order should always match tx announcement order - unit test added to confirm blob transactions are scheduled immediately for fetching - running the PR on an eth mainnet full node without incident so far --------- Signed-off-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: Gary Rong <garyrong0905@gmail.com> * core/state/snapshot: port changes from 29995 (#30040) #29995 has been reverted due to an unexpected flaw in the state snapshot process. Specifically, it attempts to stop the state snapshot generation, which could potentially cause the system to halt if the generation is not currently running. This pull request ports the changes made in #29995 and fixes the flaw. * beacon/engine/types: remove PayloadV4 (#30415) h/t @MariusVanDerWijden for finding and fixing this on devnet 3. I made the mistake of thinking `PayloadVersion` was correlated with the `GetPayloadVX` method, but it actually tracks which version of `PayloadAttributes` were passed to `forkchoiceUpdated`. So far, Prague does not necessitate a new version of fcu, so there is no need for `PayloadV4`. Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * core/vm: remove panic when address is not present (#30414) Remove redundant address presence check in `makeGasSStoreFunc`. This PR simplifies the `makeGasSStoreFunc` function by removing the redundant check for address presence in the access list. The updated code now only checks for slot presence, streamlining the logic and eliminating unnecessary panic conditions. This change removes the unnecessary address presence check, simplifying the code and improving maintainability without affecting functionality. The previous panic condition was intended as a canary during the testing phases (i.e. _YOLOv2_) and is no longer needed. * beacon/light/api: fixed blsync update query (#30421) This PR fixes what https://github.com/ethereum/go-ethereum/pull/30306/ broke. Escaping the `?` in the event sub query was fixed in that PR but it was still escaped in the `updates` request. This PR adds a URL params argument to `httpGet` and fixes `updates` query formatting. * eth/filters: prevent concurrent access in test (#30401) use a mutex to prevent concurrent access to the api.filters map during `TestPendingTxFilterDeadlock` test * core/rawdb: more accurate description of freezer in docs (#30393) fixes https://github.com/ethereum/go-ethereum/issues/29793 * core/state, core/vm: Nyota contract create init simplification (#30409) Implementation of [this EIP-4762 update](https://github.com/ethereum/EIPs/pull/8867). --------- Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Tanishq Jasoria <jasoriatanishq@gmail.com> * p2p/enode: add quic ENR entry (#30283) Add `quic` entry to the ENR as proposed in https://github.com/ethereum/consensus-specs/pull/3644 --------- Co-authored-by: lightclient <lightclient@protonmail.com> * core/tracing: fix copy/paste error+comments in reason listing (#30431) Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> * core/txpool/blobpool: avoid possible zero index panic (#30430) This situation(`len(txs) == 0`) rarely occurs, but if it does, it will panic. --------- Co-authored-by: Martin HS <martin@swende.se> * core/rawdb: remove unused transition status state accessors (#30433) * internal: run tests in parallel (#30381) Continuation of https://github.com/ethereum/go-ethereum/pull/28546 * core/types: more easily extensible tx signing (#30372) This change makes the code slightly easier for downstream-projects to extend with more signer-types, but if functionalily equivalent to the previous code. * core, trie: prealloc capacity for maps (#30437) - preallocate capacity for map - avoid `reinject` adding empty value - use `maps.Copy` * core/tracing: fix typo in comment (#30443) minor fix * core/tracing: add verkle gas change reasons to changelog (#30444) Add changes from #30409 and #29338 to changelog. --------- Co-authored-by: Martin HS <martin@swende.se> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> * Revert "core/rawdb: remove unused transition status state accessors" (#30449) Reverts ethereum/go-ethereum#30433 * params: release go-ethereum v1.14.9 stable (#30455) * params: begin v1.14.10 release cycle (#30457) * genesis: fix dev mode alloc (#30460) Balance being null causes `getGenesisState` to fail as the balance field is required in json marshaling of an account. * core: minor fix for the log wrapper with debug purpose (#30454) After this PR, https://github.com/ethereum/go-ethereum/pull/28187, the way to set the default logger is different. This PR only updates the way to set logger in some test cases' comments that existed in the codebase (since this commit https://github.com/ethereum/go-ethereum/commit/b63e3c37a6). Although I am not sure if it a good way to leave the code in the comment, it truly makes me more efficiently to debug and fix the failing test cases. * ethdb/pebble: handle errors (#30367) * .github: add release maintainers to params/ CODEOWNERS (#30458) * build: fix macos builds by working around travis osx flaw (#30479) This should fix https://github.com/ethereum/go-ethereum/issues/30471. See investigation in https://github.com/ethereum/go-ethereum/pull/30478 for more background. * beacon, core, eth, miner: integrate witnesses into production Geth (#30069) This PR integrates witness-enabled block production, witness-creating payload execution and stateless cross-validation into the `engine` API. The purpose of the PR is to enable the following use-cases (for API details, please see next section): - Cross validating locally created blocks: - Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to trigger witness creation too. - Call `getPayload` as before to retrieve the new block and also the above created witness. - Call `executeStatelessPayload` against another client to cross-validate the block. - Cross validating locally processed blocks: - Call `newPayloadWithWitness` instead of `newPayload` to trigger witness creation too. - Call `executeStatelessPayload` against another client to cross-validate the block. - Block production for stateless clients (local or MEV builders): - Call `forkchoiceUpdatedWithWitness` instead of `forkchoiceUpdated` to trigger witness creation too. - Call `getPayload` as before to retrieve the new block and also the above created witness. - Propagate witnesses across the consensus libp2p network for stateless Ethereum. - Stateless validator validation: - Call `executeStatelessPayload` with the propagated witness to statelessly validate the block. *Note, the various `WithWitness` methods could also *just be* an additional boolean flag on the base methods, but this PR wanted to keep the methods separate until a final consensus is reached on how to integrate in production.* --- The following `engine` API types are introduced: ```go // StatelessPayloadStatusV1 is the result of a stateless payload execution. type StatelessPayloadStatusV1 struct { Status string `json:"status"` StateRoot common.Hash `json:"stateRoot"` ReceiptsRoot common.Hash `json:"receiptsRoot"` ValidationError *string `json:"validationError"` } ``` - Add `forkchoiceUpdatedWithWitnessV1,2,3` with same params and returns as `forkchoiceUpdatedV1,2,3`, but triggering a stateless witness building if block production is requested. - Extend `getPayloadV2,3` to return `executionPayloadEnvelope` with an additional `witness` field of type `bytes` iff created via `forkchoiceUpdatedWithWitnessV2,3`. - Add `newPayloadWithWitnessV1,2,3,4` with same params and returns as `newPayloadV1,2,3,4`, but triggering a stateless witness creation during payload execution to allow cross validating it. - Extend `payloadStatusV1` with a `witness` field of type `bytes` if returned by `newPayloadWithWitnessV1,2,3,4`. - Add `executeStatelessPayloadV1,2,3,4` with same base params as `newPayloadV1,2,3,4` and one more additional param (`witness`) of type `bytes`. The method returns `statelessPayloadStatusV1`, which mirrors `payloadStatusV1` but replaces `latestValidHash` with `stateRoot` and `receiptRoot`. * travis: work around travis/osx/go1.23 setup bug (#30491) This is a work-around for a strange issue with travis, specifically, `os=osx, go: 1.23.1`. When this is used, the actual go that ends up being used is `go1.19.4 darwin/amd64 `. Using `which go`, it told me that the `go` in the path was a softlink at `/Users/travis/gopath/bin/go1.23.1 `. However, this was not true: using `command -v go`, it told me that the actual `go` that was used is a softlink at `/usr/local/bin/go`. This change rewrites the `/usr/local/bin/go` softlink to point to the binary at `/Users/travis/gopath/bin/go1.23.1`, so we get the right go-version. * cmd/utils: fix `setEtherbase` (#30488) Make `setEtherbase` fall thorugh and handle `miner.pending.feeRecipient` after showing deprecation-warning for `miner.etherbase`-flag. * core/state: fix comment of `mode` (#30490) * core/state: commit snapshot only if the base layer exists (#30493) This pull request skips the state snapshot update if the base layer is not existent, eliminating the numerous warning logs after an unclean shutdown. Specifically, Geth will rewind its chain head to a historical block after unclean shutdown and state snapshot will be remained as unchanged waiting for recovery. During this period of time, the snapshot is unusable and all state updates should be ignored/skipped for state snapshot update. * internal/ethapi/api: for simulated calls, set gaspool to max value if global gascap is 0 (#30474) In #27720, we introduced RPC global gas cap. A value of `0` means an unlimited gas cap. However, this was not the case for simulated calls. This PR fixes the behaviour. * core/rawdb: make sure specified state scheme is valid (#30499) This change exits with error if user provided a `--state.scheme` which is neither `hash` nor `path` * feat(repo): `geth/v1.14.9` upstream merge * internal/ethapi: fix gascap 0 for eth_simulateV1 (#30496) Similar to #30474. * core/tracing, core/vm: add ContractCode to the OpContext (#30466) Extends the opcontext interface to include accessor for code being executed in current context. While it is possible to get the code via `statedb.GetCode`, that approach doesn't work for initcode. * core/vm: more benchmarks for bls g1/g2-multiexp precompiles (#30459) This change adds more comprehensive benchmarks with a wider-variety of input sizes for g1 and g2 multi exponentiation. * p2p/discover: fix flaky tests writing to test.log after completion (#30506) This PR fixes two tests, which had a tendency to sometimes write to the `*testing.T` `log` facility after the test function had completed, which is not allowed. This PR fixes it by using waitgroups to ensure that the handler/logwriter terminates before the test exits. closes #30505 * deps: update supranational/blst (#30504) This update should only affect the fuzzers, as far as I know. But it seems like it might also fix some arm/macos compilation issue in https://github.com/ethereum/go-ethereum/issues/30494 Closes #30494 (I think) * core/txpool, eth/catalyst: ensure gas tip retains current value upon rollback (#30495) Here we move the method that drops all transactions by temporarily increasing the fee into the TxPool itself. It's better to have it there because we can set it back to the configured value afterwards. This resolves a TODO in the simulated backend. * feat(repo): Fix bug merge 1.14.9 (#320) * fix lint * fix bug * update generation files * core/txpool/blobpool: revert part of #30437, return all reinject-addresses * core/txpool/blobpool: add test to check internal shuffling * Revert "core/txpool, eth/catalyst: ensure gas tip retains current value upon rollback" (#30521) Reverts ethereum/go-ethereum#30495 You are free to create a proper Clear method if that's the best way. But one that does a proper cleanup, not some hacky call to set gas which screws up logs, metrics and everything along the way. Also doesn't work for legacy pool local transactions. The current code had a hack in the simulated code, now we have a hack in live txpooling code. No, that's not acceptable. I want the live code to be proper, meaningful API, meaningful comments, meaningful implementation. * params: release Geth v1.14.10 * params: begin v1.14.11 release cycle * feat: merge 1.14.10 * fix(taiko): Fix bug merge 1.14.9 (#325) * fix bug * fix bug * p2p/discover: add config option for disabling FINDNODE liveness check (#30512) This is for fixing Prysm integration tests. * core/txpool/blobpool: use types.Sender instead of signer.Sender (#30473) Use types.Sender(signer, tx) to utilize the transaction's sender cache and avoid repeated address recover. * build: use buildx to build multi-platform docker images (#30530) * eth/catalyst: use setcanonical instead of sethead in simulated fork (#30465) Fixes https://github.com/ethereum/go-ethereum/issues/30448 * cmd/geth: remove deprecated lightchaindata db (#30527) This PR removes the dependencies on `lightchaindata` db as the light protocol has been deprecated and removed from the codebase. * fix: fix lint errors * internal/ethapi: remove td field from block (#30386) implement https://github.com/ethereum/execution-apis/pull/570 * params: go-ethereum v1.14.11 stable * feat(repo): `geth/v1.14.11` upstream merge * feat(repo): `geth/v1.14.11` upstream merge --------- Signed-off-by: Icarus Wu <icaruswu66@qq.com> Signed-off-by: jsvisa <delweng@gmail.com> Signed-off-by: Roberto Bayardo <bayardo@alum.mit.edu> Signed-off-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Gealber Morales <48373523+Gealber@users.noreply.github.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: kukuru909 <kukuru909@gmail.com> Co-authored-by: Ha DANG <dvietha@gmail.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: TinyFoxy <tiny.fox@foxmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: maskpp <maskpp266@gmail.com> Co-authored-by: bugmaker9371 <167614621+bugmaker9371@users.noreply.github.com> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: jackyin <648588267@qq.com> Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com> Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org> Co-authored-by: Zoro <40222601+BabyHalimao@users.noreply.github.com> Co-authored-by: Dean Eigenmann <7621705+decanus@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: prpeh <prpeh@proton.me> Co-authored-by: Halimao <1065621723@qq.com> Co-authored-by: psogv0308 <psogv0308@gmail.com> Co-authored-by: David Theodore <29786815+infosecual@users.noreply.github.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: AMIR <31338382+amiremohamadi@users.noreply.github.com> Co-authored-by: lilasxie <thanklilas@163.com> Co-authored-by: gitglorythegreat <t4juu3@proton.me> Co-authored-by: Ceyhun Onur <ceyhun.onur@avalabs.org> Co-authored-by: Hteev Oli <gethorz@proton.me> Co-authored-by: winniehere <winnie050812@qq.com> Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com> Co-authored-by: zhiqiangxu <652732310@qq.com> Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> Co-authored-by: minh-bq <97180373+minh-bq@users.noreply.github.com> Co-authored-by: Nathan Jo <162083209+qqqeck@users.noreply.github.com> Co-authored-by: Jeremy Schlatter <jeremy@jeremyschlatter.com> Co-authored-by: Danyal Prout <me@dany.al> Co-authored-by: JeukHwang <92910273+JeukHwang@users.noreply.github.com> Co-authored-by: Jordan Krage <jmank88@gmail.com> Co-authored-by: Alexander Mint <webinfo.alexander@gmail.com> Co-authored-by: Sina M <1591639+s1na@users.noreply.github.com> Co-authored-by: yukionfire <yukionfire@qq.com> Co-authored-by: caseylove <casey4love@foxmail.com> Co-authored-by: dknopik <107140945+dknopik@users.noreply.github.com> Co-authored-by: Marius G <90795310+bearpebble@users.noreply.github.com> Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: Seungmin Kim <a7965344@gmail.com> Co-authored-by: Icarus Wu <icaruswu66@qq.com> Co-authored-by: ysh0566 <ysh0566@qq.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: stevemilk <wangpeculiar@gmail.com> Co-authored-by: Zhihao Lin <3955922+kkqy@users.noreply.github.com> Co-authored-by: lmittmann <3458786+lmittmann@users.noreply.github.com> Co-authored-by: lmittmann <lmittmann@users.noreply.github.com> Co-authored-by: llkhacquan <3724362+llkhacquan@users.noreply.github.com> Co-authored-by: taiking <c.tsujiyan727@gmail.com> Co-authored-by: Artyom Aminov <artjoma@users.noreply.github.com> Co-authored-by: Shude Li <islishude@gmail.com> Co-authored-by: Zoo <zoosilence@gmail.com> Co-authored-by: Adrian Sutton <adrian@oplabs.co> Co-authored-by: Dylan Vassallo <dylan.vassallo@hotmail.com> Co-authored-by: Arran Schlosberg <519948+ARR4N@users.noreply.github.com> Co-authored-by: chen4903 <108803001+chen4903@users.noreply.github.com> Co-authored-by: John Hilliard <jhilliard@polygon.technology> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: Karl Bartel <karl.bartel@clabs.co> Co-authored-by: Oksana <107276324+Ocheretovich@users.noreply.github.com> Co-authored-by: Guillaume Ballet <gballet@gmail.com> Co-authored-by: Ignacio Hagopian <jsign.uy@gmail.com> Co-authored-by: Nicolas Gotchac <ngotchac@gmail.com> Co-authored-by: markus <55011443+mdymalla@users.noreply.github.com> Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: Tanishq Jasoria <jasoriatanishq@gmail.com> Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com> Co-authored-by: Håvard Anda Estensen <haavard.ae@gmail.com> Co-authored-by: piersy <pierspowlesland@gmail.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: Szupingwang <cara4bear@gmail.com> Co-authored-by: Karol Chojnowski <karolchojnowski95@gmail.com> Co-authored-by: Ng Wei Han <47109095+weiihann@users.noreply.github.com>
1656 lines
63 KiB
Go
1656 lines
63 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/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
|
|
|
|
// maxBlobsPerTransaction is the maximum number of blobs a single transaction
|
|
// is allowed to contain. Whilst the spec states it's unlimited, the block
|
|
// data slots are protocol bound, which implicitly also limit this.
|
|
maxBlobsPerTransaction = params.MaxBlobGasPerBlock / params.BlobTxBlobGasPerBlob
|
|
|
|
// 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
|
|
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(),
|
|
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.
|
|
//
|
|
// 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 map[common.Hash]uint64 // Lookup table mapping hashes to tx 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)
|
|
|
|
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: make(map[common.Hash]uint64),
|
|
index: make(map[common.Address][]*blobTxMeta),
|
|
spent: make(map[common.Address]*uint256.Int),
|
|
}
|
|
}
|
|
|
|
// 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)
|
|
}
|
|
}
|
|
store, err := billy.Open(billy.Options{Path: queuedir, Repair: true}, newSlotter(), 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.head.ExcessBlobGas))
|
|
}
|
|
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)
|
|
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 _, exists := p.lookup[meta.hash]; exists {
|
|
// 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[meta.hash] = meta.id
|
|
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)
|
|
delete(p.lookup, txs[i].hash)
|
|
|
|
// 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)
|
|
delete(p.lookup, txs[0].hash)
|
|
|
|
// 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[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)
|
|
delete(p.lookup, txs[i].hash)
|
|
|
|
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)
|
|
delete(p.lookup, txs[j].hash)
|
|
}
|
|
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)
|
|
delete(p.lookup, last.hash)
|
|
}
|
|
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)
|
|
delete(p.lookup, last.hash)
|
|
}
|
|
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(*newHead.ExcessBlobGas))
|
|
}
|
|
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[meta.hash] = meta.id
|
|
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)
|
|
delete(p.lookup, tx.hash)
|
|
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)
|
|
delete(p.lookup, tx.hash)
|
|
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()
|
|
}
|
|
|
|
// 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 {
|
|
// Ensure the transaction adheres to basic pool filters (type, size, tip) and
|
|
// consensus rules
|
|
baseOpts := &txpool.ValidationOptions{
|
|
Config: p.chain.Config(),
|
|
Accept: 1 << types.BlobTxType,
|
|
MaxSize: txMaxSize,
|
|
MinTip: p.gasTip.ToBig(),
|
|
}
|
|
if err := txpool.ValidateTransaction(tx, p.head, p.signer, baseOpts); 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()
|
|
|
|
_, ok := p.lookup[hash]
|
|
return ok
|
|
}
|
|
|
|
// 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[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
|
|
}
|
|
|
|
// 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, local bool, 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)
|
|
|
|
delete(p.lookup, prev.hash)
|
|
p.lookup[meta.hash] = meta.id
|
|
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[meta.hash] = meta.id
|
|
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)
|
|
delete(p.lookup, drop.hash)
|
|
|
|
// 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))
|
|
|
|
if shelf.SlotSize/blobSize > maxBlobsPerTransaction {
|
|
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{}
|
|
}
|
|
|
|
// Locals retrieves the accounts currently considered local by the pool.
|
|
//
|
|
// There is no notion of local accounts in the blob pool.
|
|
func (p *BlobPool) Locals() []common.Address {
|
|
return []common.Address{}
|
|
}
|
|
|
|
// 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
|
|
}
|