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

core/txpoo/blobpool: expose gapped txs in Has and Status

Browse source 
The tx_fetcher uses txpool.Has to decide what to fetch. If
we already have a tx in the reorder buffer, it is better to
expose it.

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2025-09-23 21:03:51 +02:00
parent 81a116801d
commit a30a39b52e
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,8 @@ type BlobPool struct {
stored uint64 // Useful data size of all transactions on disk stored uint64 // Useful data size of all transactions on disk
limbo *limbo // Persistent data store for the non-finalized blobs limbo *limbo // Persistent data store for the non-finalized blobs
gapped map[common.Address][]*types.Transaction // Transactions that are currently gapped (nonce too high) gapped map[common.Address][]*types.Transaction // Transactions that are currently gapped (nonce too high)
gappedSource map[common.Hash]common.Address // Source of gapped transactions to allow rechecking on inclusion
signer types.Signer // Transaction signer to use for sender recovery signer types.Signer // Transaction signer to use for sender recovery
chain BlockChain // Chain object to access the state through chain BlockChain // Chain object to access the state through
@ -379,6 +380,7 @@ func New(config Config, chain BlockChain, hasPendingAuth func(common.Address) bo
index: make(map[common.Address][]*blobTxMeta), index: make(map[common.Address][]*blobTxMeta),
spent: make(map[common.Address]*uint256.Int), spent: make(map[common.Address]*uint256.Int),
gapped: make(map[common.Address][]*types.Transaction), gapped: make(map[common.Address][]*types.Transaction),
gappedSource: make(map[common.Hash]common.Address),
} }
} }
@ -1462,7 +1464,9 @@ func (p *BlobPool) Has(hash common.Hash) bool {
p.lock.RLock() p.lock.RLock()
defer p.lock.RUnlock() defer p.lock.RUnlock()
return p.lookup.exists(hash) poolHas := p.lookup.exists(hash)
_, gapped := p.gappedSource[hash]
return poolHas || gapped
} }
func (p *BlobPool) getRLP(hash common.Hash) []byte { func (p *BlobPool) getRLP(hash common.Hash) []byte {
@ -1747,6 +1751,7 @@ func (p *BlobPool) add(tx *types.Transaction) (err error) {
// if maxGapped is reached, it is better to give time to gapped // if maxGapped is reached, it is better to give time to gapped
// transactions by keeping the old and dropping this one // transactions by keeping the old and dropping this one
p.gapped[from] = append(p.gapped[from], tx) p.gapped[from] = append(p.gapped[from], tx)
p.gappedSource[tx.Hash()] = from
log.Trace("blobpool:add added to Gapped blob queue", "allowance", allowance, "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "qlen", len(p.gapped[from])) log.Trace("blobpool:add added to Gapped blob queue", "allowance", allowance, "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "qlen", len(p.gapped[from]))
return nil return nil
} else { } else {
@ -1908,6 +1913,7 @@ func (p *BlobPool) add(tx *types.Transaction) (err error) {
if len(p.gapped[from]) == 0 { if len(p.gapped[from]) == 0 {
delete(p.gapped, from) delete(p.gapped, from)
} }
delete(p.gappedSource, tx.Hash())
go func() { go func() {
if err := p.add(tx); err == nil { if err := p.add(tx); err == nil {
log.Trace("Gapped blob transaction added to pool", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "qlen", len(p.gapped[from])) log.Trace("Gapped blob transaction added to pool", "hash", tx.Hash(), "from", from, "nonce", tx.Nonce(), "qlen", len(p.gapped[from]))
@ -2197,9 +2203,15 @@ func (p *BlobPool) ContentFrom(addr common.Address) ([]*types.Transaction, []*ty
// Status returns the known status (unknown/pending/queued) of a transaction // Status returns the known status (unknown/pending/queued) of a transaction
// identified by their hashes. // identified by their hashes.
func (p *BlobPool) Status(hash common.Hash) txpool.TxStatus { func (p *BlobPool) Status(hash common.Hash) txpool.TxStatus {
if p.Has(hash) { p.lock.RLock()
defer p.lock.RUnlock()
if p.lookup.exists(hash) {
return txpool.TxStatusPending return txpool.TxStatusPending
} }
if _, gapped := p.gappedSource[hash]; gapped {
return txpool.TxStatusQueued
}
return txpool.TxStatusUnknown return txpool.TxStatusUnknown
} }