forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: avoid limit lower than MinGasLimit

Browse source 
if accidentally get a wrong value for gasFloor/gasCeil
This commit is contained in:
hepengfei 2019-06-12 20:13:47 +08:00
parent c8c3ebd593
commit cd003c2868
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/block_validator.go
View file

@ -120,9 +120,7 @@ func CalcGasLimit(parent *types.Block, gasFloor, gasCeil uint64) uint64 {
from parentGasLimit * (2/3) parentGasUsed is. from parentGasLimit * (2/3) parentGasUsed is.
*/ */
limit := parent.GasLimit() - decay + contrib limit := parent.GasLimit() - decay + contrib
if limit < params.MinGasLimit {
limit = params.MinGasLimit
}
// If we're outside our allowed gas range, we try to hone towards them // If we're outside our allowed gas range, we try to hone towards them
if limit < gasFloor { if limit < gasFloor {
limit = parent.GasLimit() + decay limit = parent.GasLimit() + decay
@ -135,5 +133,10 @@ func CalcGasLimit(parent *types.Block, gasFloor, gasCeil uint64) uint64 {
limit = gasCeil limit = gasCeil
} }
} }
if limit < params.MinGasLimit {
limit = params.MinGasLimit
}
return limit return limit
} }