Skip to content

filter dup tx #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KamiD merged 1 commit into from
Dec 6, 2022
Merged

filter dup tx #2833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions libs/tendermint/mempool/clist_mempool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,7 @@ func (mem *CListMempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) []types.Tx {
// size per tx, and set the initial capacity based off of that.
// txs := make([]types.Tx, 0, tmmath.MinInt(mem.txs.Len(), max/mem.avgTxSize))
txs := make([]types.Tx, 0, tmmath.MinInt(mem.txs.Len(), int(cfg.DynamicConfig.GetMaxTxNumPerBlock())))
txFilter := make(map[[32]byte]struct{})
var simCount, simGas int64
defer func() {
mem.logger.Info("ReapMaxBytesMaxGas", "ProposingHeight", mem.Height()+1,
Expand All @@ -761,6 +762,13 @@ func (mem *CListMempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) []types.Tx {
}()
for e := mem.txs.Front(); e != nil; e = e.Next() {
memTx := e.Value.(*mempoolTx)
key := txOrTxHashToKey(memTx.tx, memTx.realTx.TxHash(), mem.Height())
if _, ok := txFilter[key]; ok {
// Just log error and ignore the dup tx. and it will be packed into the next block and deleted from mempool
mem.logger.Error("found duptx in same block", "tx hash", hex.EncodeToString(key[:]))
continue
}
txFilter[key] = struct{}{}
// Check total size requirement
aminoOverhead := types.ComputeAminoOverhead(memTx.tx, 1)
if maxBytes > -1 && totalBytes+int64(len(memTx.tx))+aminoOverhead > maxBytes {
Expand Down