Merge pull request #1114 from obscuren/develop

obscuren · obscuren · commit aada35af9b6c · 2015-05-26T17:04:42.000-07:00
core: block.gasLimit - parent.gasLimit &lt;= parent.gasLimit / GasLimitB…
diff --git 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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func (sm BlockProcessor) ValidateHeader(block, parent types.Header, checkPow b`
`302`	`302`	`a := new(big.Int).Sub(block.GasLimit, parent.GasLimit)`
`303`	`303`	`a.Abs(a)`
`304`	`304`	`b := new(big.Int).Div(parent.GasLimit, params.GasLimitBoundDivisor)`
`305`		`- if !(a.Cmp(b) < 0) \|\| (block.GasLimit.Cmp(params.MinGasLimit) == -1) {`
	`305`	`+ if !(a.Cmp(b) <= 0) \|\| (block.GasLimit.Cmp(params.MinGasLimit) == -1) {`
`306`	`306`	`return fmt.Errorf("GasLimit check failed for block %v (%v > %v)", block.GasLimit, a, b)`
`307`	`307`	`}`
`308`	`308`