forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/txpool/legacypool: track auths with associated tx hash

Browse source
This commit is contained in:
lightclient 2025-02-07 12:38:58 -07:00
parent 85dceefeae
commit 0c0d6b33ab
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/txpool/legacypool/legacypool.go
View file

@ -1662,14 +1662,14 @@ type lookup struct {
lock sync.RWMutex lock sync.RWMutex
txs map[common.Hash]*types.Transaction txs map[common.Hash]*types.Transaction
auths map[common.Address][]*types.Transaction // All accounts with a pooled authorization auths map[common.Address][]common.Hash // All accounts with a pooled authorization
} }
// newLookup returns a new lookup structure. // newLookup returns a new lookup structure.
func newLookup() *lookup { func newLookup() *lookup {
return &lookup{ return &lookup{
txs: make(map[common.Hash]*types.Transaction), txs: make(map[common.Hash]*types.Transaction),
auths: make(map[common.Address][]*types.Transaction), auths: make(map[common.Address][]common.Hash),
} }
} }
@ -1728,6 +1728,7 @@ func (t *lookup) Remove(hash common.Hash) {
t.lock.Lock() t.lock.Lock()
defer t.lock.Unlock() defer t.lock.Unlock()
t.removeAuthorities(hash)
tx, ok := t.txs[hash] tx, ok := t.txs[hash]
if !ok { if !ok {
log.Error("No transaction found to be deleted", "hash", hash) log.Error("No transaction found to be deleted", "hash", hash)
@ -1735,7 +1736,6 @@ func (t *lookup) Remove(hash common.Hash) {
} }
t.slots -= numSlots(tx) t.slots -= numSlots(tx)
slotsGauge.Update(int64(t.slots)) slotsGauge.Update(int64(t.slots))
t.removeAuthorities(tx)
delete(t.txs, hash) delete(t.txs, hash)
} }
@ -1758,27 +1758,27 @@ func (t *lookup) addAuthorities(tx *types.Transaction) {
for _, addr := range tx.Authorities() { for _, addr := range tx.Authorities() {
list, ok := t.auths[addr] list, ok := t.auths[addr]
if !ok { if !ok {
list = []*types.Transaction{} list = []common.Hash{}
} }
if slices.Contains(list, tx) { if slices.Contains(list, tx.Hash()) {
// Don't add duplicates. // Don't add duplicates.
continue continue
} }
list = append(list, tx) list = append(list, tx.Hash())
t.auths[addr] = list t.auths[addr] = list
} }
} }
// removeAuthorities stops tracking the supplied tx in relation to its // removeAuthorities stops tracking the supplied tx in relation to its
// authorities. // authorities.
func (t *lookup) removeAuthorities(tx *types.Transaction) { func (t *lookup) removeAuthorities(hash common.Hash) {
for _, addr := range tx.Authorities() { for addr := range t.auths {
// Remove tx from tracker.
list := t.auths[addr] list := t.auths[addr]
if i := slices.Index(list, tx); i >= 0 { // Remove tx from tracker.
if i := slices.Index(list, hash); i >= 0 {
list = append(list[:i], list[i+1:]...) list = append(list[:i], list[i+1:]...)
} else { } else {
log.Error("Authority with untracked tx", "addr", addr, "hash", tx.Hash()) log.Error("Authority with untracked tx", "addr", addr, "hash", hash)
} }
if len(list) == 0 { if len(list) == 0 {
// If list is newly empty, delete it entirely. // If list is newly empty, delete it entirely.