forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 20:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/txpool/blobpool: fix blob tx replacement

Browse source 
Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2025-09-25 12:30:00 +02:00
parent 52efe146f3
commit 24b9c5dcb0
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
1 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
core/txpool/blobpool/blobpool.go
View file

@ -1746,6 +1746,13 @@ func (p *BlobPool) add(tx *types.Transaction) (err error) {
addtimeHist.Update(time.Since(start).Nanoseconds()) addtimeHist.Update(time.Since(start).Nanoseconds())
}(time.Now()) }(time.Now())
return p.addLocked(tx, true)
}
// addLocked inserts a new blob transaction into the pool if it passes validation (both
// consensus validity and pool restrictions). It must be called with the pool lock held.
// Only for internal use.
func (p *BlobPool) addLocked(tx *types.Transaction, checkGapped bool) (err error) {
// Ensure the transaction is valid from all perspectives // Ensure the transaction is valid from all perspectives
if err := p.validateTx(tx); err != nil { if err := p.validateTx(tx); err != nil {
log.Trace("Transaction validation failed", "hash", tx.Hash(), "err", err) log.Trace("Transaction validation failed", "hash", tx.Hash(), "err", err)
@ -1909,34 +1916,48 @@ func (p *BlobPool) add(tx *types.Transaction) (err error) {
addValidMeter.Mark(1) addValidMeter.Mark(1)
// Notify all listeners of the new arrival
p.discoverFeed.Send(core.NewTxsEvent{Txs: []*types.Transaction{tx.WithoutBlobTxSidecar()}})
p.insertFeed.Send(core.NewTxsEvent{Txs: []*types.Transaction{tx.WithoutBlobTxSidecar()}})
//check the gapped queue for this account and try to promote //check the gapped queue for this account and try to promote
if gtxs, ok := p.gapped[from]; ok && len(gtxs) > 0 { if gtxs, ok := p.gapped[from]; checkGapped && ok && len(gtxs) > 0 {
// We have to add in nonce order, but we want to stable sort to cater for situations // We have to add in nonce order, but we want to stable sort to cater for situations
// where transactions are replaced, keeping the original receive order for same nonce // where transactions are replaced, keeping the original receive order for same nonce
sort.SliceStable(gtxs, func(i, j int) bool { sort.SliceStable(gtxs, func(i, j int) bool {
return gtxs[i].tx.Nonce() < gtxs[j].tx.Nonce() return gtxs[i].tx.Nonce() < gtxs[j].tx.Nonce()
}) })
firstgap := p.state.GetNonce(from) + uint64(len(p.index[from]))
for len(gtxs) > 0 { for len(gtxs) > 0 {
if gtxs[0].tx.Nonce() <= firstgap { stateNonce := p.state.GetNonce(from)
// Drop any buffered transactions that became stale in themeantime (included in chain or replaced) firstgap := stateNonce + uint64(len(p.index[from]))
// If we arrive to the tx at the first gap, we try to add it now (also dropping it from the gapped queue)
tx := gtxs[0].tx if gtxs[0].tx.Nonce() > firstgap {
gtxs[0] = nil // Anything beyond the first gap is not addable yet
gtxs = gtxs[1:] break
delete(p.gappedSource, tx.Hash()) }
if tx.Nonce() == firstgap {
// We are under lock. Add the first transaction in a goroutine to avoid blocking. // Drop any buffered transactions that became stale in the meantime (included in chain or replaced)
// This might lead to a race between new calls to add and the revalidation here, // If we arrive to the transaction in the pending range (between the state Nonce and first gap, we
// we should revisit if this is a potential issue. // try to add them now while removing from here.
go func() { tx := gtxs[0].tx
if err := p.add(tx); err == nil { gtxs[0] = nil
log.Trace("Gapped blob transaction added to pool", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "qlen", len(p.gapped[from])) gtxs = gtxs[1:]
} else { delete(p.gappedSource, tx.Hash())
log.Trace("Gapped blob transaction not accepted", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "err", err)
} if tx.Nonce() < stateNonce {
}() // Stale, drop it. Eventually we could add to limbo here if hash matches.
break log.Trace("Gapped blob transaction became stale", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "state", stateNonce, "qlen", len(p.gapped[from]))
continue
}
if tx.Nonce() <= firstgap {
// If we hit the pending range, including the first gap, add it and continue to try to add more.
// We do not recurse here, but continue to loop instead.
// We are under lock, so we can add the transaction directly.
if err := p.addLocked(tx, false); err == nil {
log.Trace("Gapped blob transaction added to pool", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "qlen", len(p.gapped[from]))
} else {
log.Trace("Gapped blob transaction not accepted", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "err", err)
} }
} }
} }
@ -1946,9 +1967,6 @@ func (p *BlobPool) add(tx *types.Transaction) (err error) {
p.gapped[from] = gtxs p.gapped[from] = gtxs
} }
} }
// Notify all listeners of the new arrival
p.discoverFeed.Send(core.NewTxsEvent{Txs: []*types.Transaction{tx.WithoutBlobTxSidecar()}})
p.insertFeed.Send(core.NewTxsEvent{Txs: []*types.Transaction{tx.WithoutBlobTxSidecar()}})
return nil return nil
} }