Skip to content
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

fix: deadlock when add bundle into bundlepool #46

Merged
merged 2 commits into from
Aug 13, 2024
Merged

fix: deadlock when add bundle into bundlepool #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0309403
fix: concurrrent issue in bundlepool
irrun Aug 6, 2024
59ff1af
fix: concurrrent issue in bundlepool
irrun Aug 6, 2024
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: 4 additions & 5 deletions core/txpool/bundlepool/bundlepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,15 @@ func (p *BundlePool) AddBundle(bundle *types.Bundle) error {
if err != nil {
return err
}

p.mu.Lock()
defer p.mu.Unlock()

if price.Cmp(p.minimalBundleGasPrice()) < 0 && p.slots+numSlots(bundle) > p.config.GlobalSlots {
return ErrBundleGasPriceLow
}
bundle.Price = price

p.mu.Lock()
defer p.mu.Unlock()

hash := bundle.Hash()
if _, ok := p.bundles[hash]; ok {
return ErrBundleAlreadyExist
Expand Down Expand Up @@ -326,8 +327,6 @@ func (p *BundlePool) deleteBundle(hash common.Hash) {

// drop removes the bundle with the lowest gas price from the pool.
func (p *BundlePool) drop() {
p.mu.Lock()
defer p.mu.Unlock()
for len(p.bundleHeap) > 0 {
// Pop the bundle with the lowest gas price
// the min element in the heap may not exist in the pool as it may be pruned
Expand Down
Loading