fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-01 09:42:12 +00:00
Code Issues Projects Releases Wiki Activity

mempool: add a comment and missing changelog entry (#2996)

Browse Source 
Refs #2994
This commit is contained in:
Dev Ojha 2018-12-12 01:31:35 -08:00 committed by Anton Kaliaev
parent 9e075d8dd5
commit bc2a9b20c0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_PENDING.md
View File

@ -23,4 +23,5 @@ Special thanks to external contributors on this release:
### BUG FIXES: ### BUG FIXES:
- [kv indexer] \#2912 don't ignore key when executing CONTAINS - [kv indexer] \#2912 don't ignore key when executing CONTAINS
- [mempool] \#2994 Don't allow txs with negative gas wanted
- [p2p] \#2715 fix a bug where seeds don't disconnect from a peer after 3h - [p2p] \#2715 fix a bug where seeds don't disconnect from a peer after 3h

10
mempool/mempool.go
View File

@ -490,11 +490,15 @@ func (mem *Mempool) ReapMaxBytesMaxGas(maxBytes, maxGas int64) types.Txs {
return txs return txs
} }
totalBytes += int64(len(memTx.tx)) + aminoOverhead totalBytes += int64(len(memTx.tx)) + aminoOverhead
// Check total gas requirement // Check total gas requirement.
if maxGas > -1 && totalGas+memTx.gasWanted > maxGas { // If maxGas is negative, skip this check.
// Since newTotalGas < masGas, which
// must be non-negative, it follows that this won't overflow.
newTotalGas := totalGas + memTx.gasWanted
if maxGas > -1 && newTotalGas > maxGas {
return txs return txs
} }
totalGas += memTx.gasWanted totalGas = newTotalGas
txs = append(txs, memTx.tx) txs = append(txs, memTx.tx)
} }
return txs return txs