smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2025-04-04 15:55:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix txs limit in mempool

Browse Source
This commit is contained in:
Solovyov1796 2025-03-10 17:33:31 +08:00
parent d1b83b5ac8
commit c066af2a47
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/priority_nonce.go
View File

@ -14,7 +14,7 @@ import (
evmtypes "github.com/evmos/ethermint/x/evm/types" evmtypes "github.com/evmos/ethermint/x/evm/types"
) )
const MAX_TXS_PRE_SENDER_IN_MEMPOOL int = 10 const MAX_TXS_PRE_SENDER_IN_MEMPOOL int = 16
var ( var (
_ mempool.Mempool = (*PriorityNonceMempool)(nil) _ mempool.Mempool = (*PriorityNonceMempool)(nil)
@ -37,6 +37,7 @@ type PriorityNonceMempool struct {
txReplacement func(op, np int64, oTx, nTx sdk.Tx) bool txReplacement func(op, np int64, oTx, nTx sdk.Tx) bool
maxTx int maxTx int
counterBySender map[string]int counterBySender map[string]int
txRecord map[txMeta]struct{}
} }
type PriorityNonceIterator struct { type PriorityNonceIterator struct {
@ -137,6 +138,7 @@ func NewPriorityMempool(opts ...PriorityNonceMempoolOption) *PriorityNonceMempoo
senderIndices: make(map[string]*skiplist.SkipList), senderIndices: make(map[string]*skiplist.SkipList),
scores: make(map[txMeta]txMeta), scores: make(map[txMeta]txMeta),
counterBySender: make(map[string]int), counterBySender: make(map[string]int),
txRecord: make(map[txMeta]struct{}),
} }
for _, opt := range opts { for _, opt := range opts {
@ -208,6 +210,10 @@ func (mp *PriorityNonceMempool) Insert(ctx context.Context, tx sdk.Tx) error {
nonce = sig.Sequence nonce = sig.Sequence
} }
existsKey := txMeta{nonce: nonce, sender: sender}
if _, exists := mp.txRecord[existsKey]; !exists {
mp.txRecord[existsKey] = struct{}{}
if _, exists := mp.counterBySender[sender]; !exists { if _, exists := mp.counterBySender[sender]; !exists {
mp.counterBySender[sender] = 1 mp.counterBySender[sender] = 1
} else { } else {
@ -217,6 +223,7 @@ func (mp *PriorityNonceMempool) Insert(ctx context.Context, tx sdk.Tx) error {
return fmt.Errorf("tx sender has too many txs in mempool") return fmt.Errorf("tx sender has too many txs in mempool")
} }
} }
}
key := txMeta{nonce: nonce, priority: priority, sender: sender} key := txMeta{nonce: nonce, priority: priority, sender: sender}
@ -450,6 +457,19 @@ func (mp *PriorityNonceMempool) Remove(tx sdk.Tx) error {
nonce = sig.Sequence nonce = sig.Sequence
} }
existsKey := txMeta{nonce: nonce, sender: sender}
if _, exists := mp.txRecord[existsKey]; exists {
delete(mp.txRecord, existsKey)
if _, exists := mp.counterBySender[sender]; exists {
if mp.counterBySender[sender] > 1 {
mp.counterBySender[sender] -= 1
} else {
delete(mp.counterBySender, sender)
}
}
}
scoreKey := txMeta{nonce: nonce, sender: sender} scoreKey := txMeta{nonce: nonce, sender: sender}
score, ok := mp.scores[scoreKey] score, ok := mp.scores[scoreKey]
if !ok { if !ok {
@ -467,14 +487,6 @@ func (mp *PriorityNonceMempool) Remove(tx sdk.Tx) error {
delete(mp.scores, scoreKey) delete(mp.scores, scoreKey)
mp.priorityCounts[score.priority]-- mp.priorityCounts[score.priority]--
if _, exists := mp.counterBySender[sender]; exists {
if mp.counterBySender[sender] > 1 {
mp.counterBySender[sender] -= 1
} else {
delete(mp.counterBySender, sender)
}
}
return nil return nil
} }