-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improve Pending() of txpool to reduce the latency when miner worker c…
…ommitting transactions (#85) Co-authored-by: andyzhang2023 <[email protected]> Co-authored-by: Owen <[email protected]>
- Loading branch information
3 people
authored
Jun 7, 2024
1 parent
feb5bfe
commit bc67f16
Showing
7 changed files
with
222 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| package legacypool | ||
|
|
||
| import ( | ||
| "math/big" | ||
| "sort" | ||
| "sync" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/txpool" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/ethereum/go-ethereum/metrics" | ||
| ) | ||
|
|
||
| var ( | ||
| pendingCacheGauge = metrics.NewRegisteredGauge("txpool/legacypool/pending/cache", nil) | ||
| localCacheGauge = metrics.NewRegisteredGauge("txpool/legacypool/local/cache", nil) | ||
| ) | ||
|
|
||
| // copy of pending transactions | ||
| type cacheForMiner struct { | ||
| txLock sync.Mutex | ||
| pending map[common.Address]map[*types.Transaction]struct{} | ||
| locals map[common.Address]bool | ||
| addrLock sync.Mutex | ||
| } | ||
|
|
||
| func newCacheForMiner() *cacheForMiner { | ||
| return &cacheForMiner{ | ||
| pending: make(map[common.Address]map[*types.Transaction]struct{}), | ||
| locals: make(map[common.Address]bool), | ||
| } | ||
| } | ||
|
|
||
| func (pc *cacheForMiner) add(txs types.Transactions, signer types.Signer) { | ||
| if len(txs) == 0 { | ||
| return | ||
| } | ||
| pc.txLock.Lock() | ||
| defer pc.txLock.Unlock() | ||
| pendingCacheGauge.Inc(int64(len(txs))) | ||
| for _, tx := range txs { | ||
| addr, _ := types.Sender(signer, tx) | ||
| slots, ok := pc.pending[addr] | ||
| if !ok { | ||
| slots = make(map[*types.Transaction]struct{}) | ||
| pc.pending[addr] = slots | ||
| } | ||
| slots[tx] = struct{}{} | ||
| } | ||
| } | ||
|
|
||
| func (pc *cacheForMiner) del(txs types.Transactions, signer types.Signer) { | ||
| if len(txs) == 0 { | ||
| return | ||
| } | ||
| pc.txLock.Lock() | ||
| defer pc.txLock.Unlock() | ||
| for _, tx := range txs { | ||
| addr, _ := types.Sender(signer, tx) | ||
| slots, ok := pc.pending[addr] | ||
| if !ok { | ||
| continue | ||
| } | ||
| pendingCacheGauge.Dec(1) | ||
| delete(slots, tx) | ||
| if len(slots) == 0 { | ||
| delete(pc.pending, addr) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (pc *cacheForMiner) dump(pool txpool.LazyResolver, gasPrice, baseFee *big.Int, enforceTip bool) map[common.Address][]*txpool.LazyTransaction { | ||
| pending := make(map[common.Address]types.Transactions) | ||
| pc.txLock.Lock() | ||
| for addr, txlist := range pc.pending { | ||
| pending[addr] = make(types.Transactions, 0, len(txlist)) | ||
| for tx := range txlist { | ||
| pending[addr] = append(pending[addr], tx) | ||
| } | ||
| } | ||
| pc.txLock.Unlock() | ||
| pendingLazy := make(map[common.Address][]*txpool.LazyTransaction) | ||
| for addr, txs := range pending { | ||
| // sorted by nonce | ||
| sort.Sort(types.TxByNonce(txs)) | ||
| // If the miner requests tip enforcement, cap the lists now | ||
| if enforceTip && !pc.isLocal(addr) { | ||
| for i, tx := range txs { | ||
| if tx.EffectiveGasTipIntCmp(gasPrice, baseFee) < 0 { | ||
| txs = txs[:i] | ||
| break | ||
| } | ||
| } | ||
| } | ||
| if len(txs) > 0 { | ||
| lazies := make([]*txpool.LazyTransaction, len(txs)) | ||
| for i, tx := range txs { | ||
| lazies[i] = &txpool.LazyTransaction{ | ||
| Pool: pool, | ||
| Hash: tx.Hash(), | ||
| Tx: tx, | ||
| Time: tx.Time(), | ||
| GasFeeCap: tx.GasFeeCap(), | ||
| GasTipCap: tx.GasTipCap(), | ||
| Gas: tx.Gas(), | ||
| BlobGas: tx.BlobGas(), | ||
| } | ||
| } | ||
| pendingLazy[addr] = lazies | ||
| } | ||
| } | ||
| return pendingLazy | ||
| } | ||
|
|
||
| func (pc *cacheForMiner) markLocal(addr common.Address) { | ||
| pc.addrLock.Lock() | ||
| defer pc.addrLock.Unlock() | ||
| localCacheGauge.Inc(1) | ||
| pc.locals[addr] = true | ||
| } | ||
|
|
||
| func (pc *cacheForMiner) isLocal(addr common.Address) bool { | ||
| pc.addrLock.Lock() | ||
| defer pc.addrLock.Unlock() | ||
| return pc.locals[addr] | ||
| } | ||
|
|
||
| func (pc *cacheForMiner) flattenLocals() []common.Address { | ||
| pc.addrLock.Lock() | ||
| defer pc.addrLock.Unlock() | ||
| locals := make([]common.Address, 0, len(pc.locals)) | ||
| for addr := range pc.locals { | ||
| locals = append(locals, addr) | ||
| } | ||
| return locals | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.