[release/1.4.9] Revert "core: update DAO soft-fork number, clean up the code"

This reverts commit aefffc9ed8.
2016-06-29 11:53:06 +03:00
parent f4aebd4c8d
commit 3eef19598e
10 changed files with 67 additions and 49 deletions
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -371,10 +371,5 @@ func CalcGasLimit(parent *types.Block) *big.Int {
 		gl.Add(parent.GasLimit(), decay)
 		gl.Set(common.BigMin(gl, params.TargetGasLimit))
 	}
-	// Temporary special case: if DAO rupture is requested, cap the gas limit
-	if DAOSoftFork && parent.NumberU64() <= ruptureBlock && gl.Cmp(ruptureTarget) > 0 {
-		gl.Sub(parent.GasLimit(), decay)
-		gl.Set(common.BigMax(gl, ruptureTarget))
-	}
 	return gl
 }