aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-27 19:23:55 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-27 19:23:55 +0800
commit4b29e5ba8577f33b9440d15cf7b49aabd602fe83 (patch)
tree0cdbf7588385586936e86fb9cfbe852acf53e76e
parentf5ce848cfe8cc1912714b8185f8dd3358a16687a (diff)
parent14955bd4542e422daad5c6b39cfe07cdcb86b230 (diff)
downloaddexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.tar
dexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.tar.gz
dexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.tar.bz2
dexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.tar.lz
dexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.tar.xz
dexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.tar.zst
dexon-4b29e5ba8577f33b9440d15cf7b49aabd602fe83.zip
Merge pull request #1120 from Gustav-Simonsson/revert_gas_limit_change
Revert "core: block.gasLimit - parent.gasLimit <= parent.gasLimit / G…
-rw-r--r--core/block_processor.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/block_processor.go b/core/block_processor.go
index e808c03da..037782407 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -302,7 +302,7 @@ func (sm *BlockProcessor) ValidateHeader(block, parent *types.Header, checkPow b
a := new(big.Int).Sub(block.GasLimit, parent.GasLimit)
a.Abs(a)
b := new(big.Int).Div(parent.GasLimit, params.GasLimitBoundDivisor)
- if !(a.Cmp(b) <= 0) || (block.GasLimit.Cmp(params.MinGasLimit) == -1) {
+ if !(a.Cmp(b) < 0) || (block.GasLimit.Cmp(params.MinGasLimit) == -1) {
return fmt.Errorf("GasLimit check failed for block %v (%v > %v)", block.GasLimit, a, b)
}