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

delete the certain value of id

Browse source
This commit is contained in:
maskpp 2025-07-01 11:26:01 +08:00
parent 663fa7b496
commit 315d381603
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/txpool/reserver.go
View file

@ -39,14 +39,14 @@ var (
// the account and ensure that one address cannot initiate transactions, authorizations, // the account and ensure that one address cannot initiate transactions, authorizations,
// and other state-changing behaviors in different pools at the same time. // and other state-changing behaviors in different pools at the same time.
type ReservationTracker struct { type ReservationTracker struct {
accounts map[common.Address]int accounts map[common.Address]struct{}
lock sync.RWMutex lock sync.RWMutex
} }
// NewReservationTracker initializes the account reservation tracker. // NewReservationTracker initializes the account reservation tracker.
func NewReservationTracker() *ReservationTracker { func NewReservationTracker() *ReservationTracker {
return &ReservationTracker{ return &ReservationTracker{
accounts: make(map[common.Address]int), accounts: make(map[common.Address]struct{}),
} }
} }
@ -88,15 +88,11 @@ func (h *ReservationHandle) Hold(addr common.Address) error {
// Double reservations are forbidden even from the same pool to // Double reservations are forbidden even from the same pool to
// avoid subtle bugs in the long term. // avoid subtle bugs in the long term.
owner, exists := h.tracker.accounts[addr] _, exists := h.tracker.accounts[addr]
if exists { if exists {
if owner == h.id {
log.Error("pool attempted to reserve already-owned address", "address", addr)
return nil // Ignore fault to give the pool a chance to recover while the bug gets fixed
}
return ErrAlreadyReserved return ErrAlreadyReserved
} }
h.tracker.accounts[addr] = h.id h.tracker.accounts[addr] = struct{}{}
if metrics.Enabled() { if metrics.Enabled() {
m := fmt.Sprintf("%s/%d", reservationsGaugeName, h.id) m := fmt.Sprintf("%s/%d", reservationsGaugeName, h.id)
metrics.GetOrRegisterGauge(m, nil).Inc(1) metrics.GetOrRegisterGauge(m, nil).Inc(1)
@ -111,15 +107,11 @@ func (h *ReservationHandle) Release(addr common.Address) error {
// Ensure subpools only attempt to unreserve their own owned addresses, // Ensure subpools only attempt to unreserve their own owned addresses,
// otherwise flag as a programming error. // otherwise flag as a programming error.
owner, exists := h.tracker.accounts[addr] _, exists := h.tracker.accounts[addr]
if !exists { if !exists {
log.Error("pool attempted to unreserve non-reserved address", "address", addr) log.Error("pool attempted to unreserve non-reserved address", "address", addr)
return errors.New("address not reserved") return errors.New("address not reserved")
} }
if owner != h.id {
log.Error("pool attempted to unreserve non-owned address", "address", addr)
return errors.New("address not owned")
}
delete(h.tracker.accounts, addr) delete(h.tracker.accounts, addr)
if metrics.Enabled() { if metrics.Enabled() {
m := fmt.Sprintf("%s/%d", reservationsGaugeName, h.id) m := fmt.Sprintf("%s/%d", reservationsGaugeName, h.id)
@ -133,6 +125,6 @@ func (h *ReservationHandle) Has(address common.Address) bool {
h.tracker.lock.RLock() h.tracker.lock.RLock()
defer h.tracker.lock.RUnlock() defer h.tracker.lock.RUnlock()
id, exists := h.tracker.accounts[address] _, exists := h.tracker.accounts[address]
return exists && id != h.id return exists
} }