Skip to content

Commit

Permalink
fix: deadlock when add bundle into bundlepool (#46)
Browse files Browse the repository at this point in the history
  • Loading branch information
irrun authored Aug 13, 2024
1 parent d5ab727 commit b655488
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions core/txpool/bundlepool/bundlepool.go
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

0 comments on commit b655488

Please sign in to comment.