Skip to content

miner: enable trie prefetcher in block builder #33945

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
rjl493456442 merged 2 commits into from
Mar 4, 2026
Merged

miner: enable trie prefetcher in block builder #33945

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7bd132
miner: enable trie prefetcher in block builder
jrhea Mar 3, 2026
7e0fb35
miner: close the state prefetcher at avoid thread leaks
rjl493456442 Mar 3, 2026
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
11 changes: 9 additions & 2 deletions miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ func (env *environment) txFitsSize(tx *types.Transaction) bool {
return env.size+tx.Size() < params.MaxBlockSize-maxBlockSizeBufferZone
}

// discard terminates the background threads before discarding it.
func (env *environment) discard() {
env.state.StopPrefetcher()
}

const (
commitInterruptNone int32 = iota
commitInterruptNewHead
Expand Down Expand Up @@ -125,6 +130,7 @@ func (miner *Miner) generateWork(genParam *generateParams, witness bool) *newPay
if err != nil {
return &newPayloadResult{err: err}
}
defer work.discard()

// Check withdrawals fit max block size.
// Due to the cap on withdrawal count, this can actually never happen, but we still need to
Expand Down Expand Up @@ -306,13 +312,14 @@ func (miner *Miner) makeEnv(parent *types.Header, header *types.Header, coinbase
if err != nil {
return nil, err
}
var bundle *stateless.Witness
if witness {
bundle, err := stateless.NewWitness(header, miner.chain)
bundle, err = stateless.NewWitness(header, miner.chain)
if err != nil {
return nil, err
}
state.StartPrefetcher("miner", bundle, nil)
}
state.StartPrefetcher("miner", bundle, nil)
// Note the passed coinbase may be different with header.Coinbase.
return &environment{
signer: types.MakeSigner(miner.chainConfig, header.Number, header.Time),
Expand Down
Loading