TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-12-12 11:10:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1022 from nspcc-dev/fix-maxfreetxperblock-neox-2.x

Browse source 
core: respect MaxFreeTransactionsPerBlock setting
This commit is contained in:
Roman Khimov 2020-06-08 12:53:26 +03:00 committed by GitHub
commit 349d8a1984
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/core/blockchain.go
View file

@ -1528,12 +1528,13 @@ func (bc *Blockchain) ApplyPolicyToTxSet(txes []mempool.TxWithFee) []mempool.TxW
txes = txes[:bc.config.MaxTransactionsPerBlock] txes = txes[:bc.config.MaxTransactionsPerBlock]
} }
maxFree := bc.config.MaxFreeTransactionsPerBlock maxFree := bc.config.MaxFreeTransactionsPerBlock
if maxFree != 0 { if maxFree != 0 && len(txes) > maxFree {
lowStart := sort.Search(len(txes), func(i int) bool { // Transactions are sorted by fee, so we just find the first free one.
return bc.IsLowPriority(txes[i].Fee) freeStart := sort.Search(len(txes), func(i int) bool {
return txes[i].Fee == 0
}) })
if lowStart+maxFree < len(txes) { if freeStart+maxFree < len(txes) {
txes = txes[:lowStart+maxFree] txes = txes[:freeStart+maxFree]
} }
} }
return txes return txes