Skip to content

core/txpool: remove locals-tracking from pools (part 2) #30559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MariusVanDerWijden merged 17 commits into from
Feb 4, 2025
Merged

core/txpool: remove locals-tracking from pools (part 2) #30559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
65a11cc
core/txpool/legacypool: implement transaction tracking for handling l…
holiman Jun 21, 2023
02bfc7b
miner: implement prioritized addresses (reuse --txpool.locals)
holiman Oct 9, 2024
ca63de4
core/txpool: remove locals-tracking from subpools
holiman Oct 8, 2024
c2efd6f
core/txpool: split out tracker from the legacy pool
holiman Oct 8, 2024
183fc10
core/txpool/legacypool: get the tests in order
holiman Oct 8, 2024
2b8a21d
core/txpool, eth/catalyst: api changes, test update, external trigger…
holiman Oct 9, 2024
09abeed
core/txpool/tracking: fix nil deref
holiman Oct 10, 2024
581264d
core/txpool/tracker: address review concerns (pkg name + unused)
holiman Nov 4, 2024
4e0edac
core/txpool/legacypool: fix non-determinism in test
holiman Dec 12, 2024
14fd80e
eth/catalyst: test timeout bump
holiman Dec 12, 2024
7fd1563
core/txpool/legacypool: post-rebase fixup
holiman Dec 12, 2024
231a2a5
eth/catalyst: skip flaky test
holiman Dec 13, 2024
8639d5c
core/txpool: don't track blobtxs, don't track invalid txs
holiman Jan 7, 2025
3c33b7b
core/txpool rename tracker -> locals, re-add locals-gauge
holiman Jan 9, 2025
df1db0b
Merge branch 'master' into local_pool_pt2
holiman Jan 14, 2025
a0283d1
Merge branch 'master' into local_pool_pt2
holiman Jan 17, 2025
9265126
core/txpool, eth, miner: code polish
rjl493456442 Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions core/txpool/blobpool/blobpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ func (p *BlobPool) GetBlobs(vhashes []common.Hash) ([]*kzg4844.Blob, []*kzg4844.

// 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 {
func (p *BlobPool) Add(txs []*types.Transaction, sync bool) []error {
Comment thread
holiman marked this conversation as resolved.
var (
adds = make([]*types.Transaction, 0, len(txs))
errs = make([]error, len(txs))
Expand Down Expand Up @@ -1699,13 +1699,6 @@ func (p *BlobPool) ContentFrom(addr common.Address) ([]*types.Transaction, []*ty
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 {
Expand Down
385 changes: 72 additions & 313 deletions core/txpool/legacypool/legacypool.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading