core/txpool, eth/catalyst: add API method to drop tracked txs from pools. prevent simulated beacon Rollback from reverting gas tip to 1 gwei. #30534
+94
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…interface. Make simulated beacon rollback use the new method, fix old hack
jwasinger
requested review from
gballet,
lightclient,
karalabe,
holiman and
rjl493456442
as code owners
jwasinger
changed the title
karalabe
reviewed
Oct 1, 2024
core/txpool/subpool.go
Outdated
| @@ -162,4 +162,7 @@ type SubPool interface { | |||
| // Status returns the known status (unknown/pending/queued) of a transaction | |||
| // identified by their hashes. | |||
| Status(hash common.Hash) TxStatus | |||
|
|
|||
| // DropTransactions removes all tracked transactions from the pool | |||
| DropTransactions() | |||
holiman
reviewed
Oct 1, 2024
karalabe
reviewed
Oct 1, 2024
| p.lock.Lock() | ||
| defer p.lock.Unlock() | ||
|
|
||
| // manually iterating and deleting every entry is super sub-optimal |
There was a problem hiding this comment.
We should probably iterate and unreserve the addresses here. It's less optimal that recreating the reservations map in the parent pool, but that's very sensitive datarace wise, so it's simpler to iterate for now.
karalabe
reviewed
Oct 1, 2024
| p.mu.Lock() | ||
| defer p.mu.Unlock() | ||
|
|
||
| p.all = newLookup() |
There was a problem hiding this comment.
We should probably iterate and unreserve the addresses here. It's less optimal that recreating the reservations map in the parent pool, but that's very sensitive datarace wise, so it's simpler to iterate for now.
…it's not done at the TxPool level.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds an API method
DropTransactionsto legacy pool, blob pool and txpool interface. This method removes all txs currently tracked in the pools.It modifies the simulated beacon to use the new method in
Rollbackwhich removes previous hacky implementation that also erroneously reset the gas tip to 1 gwei.